From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 23 Oct 2010 14:09:57 +0000 (+0000)
Subject: Use rpmbuild to build the RPMs in "make rpm" target.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7f755989478d343c5e3a28c5f90ae864841cb617

Use rpmbuild to build the RPMs in "make rpm" target.

In recent versions of rpm rpmbuild must be used for building the RPMs instead
of rpm itself.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/Makefile.in b/Makefile.in
index a55938aaf4..c4609122cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37159,8 +37159,8 @@ rpm: bzip-dist
 	-mkdir $(RPMTOP)/RPMS
 	-mkdir $(RPMTOP)/SRPMS
 	cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
-	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
-	mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` .
+	rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
+	mv -f `find $(RPMTOP) -name "wx-*.rpm"` .
 
 
 # Include dependency info, if present:
diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 1adbbebecc..467a6f194a 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -933,5 +933,5 @@ rpm: bzip-dist
 	-mkdir $(RPMTOP)/RPMS
 	-mkdir $(RPMTOP)/SRPMS
 	cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
-	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
-	mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` .
+	rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
+	mv -f `find $(RPMTOP) -name "wx-*.rpm"` .