From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 28 Dec 2003 17:21:16 +0000 (+0000)
Subject: Updated RPM build machinery.
X-Git-Tag: 1.4
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=172e1f37b03d18805bd3db3beec11f91747523a3;p=semex.git

Updated RPM build machinery.
---

diff --git a/Makefile b/Makefile
index 639cff0..6cda7db 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # semex -- the semaphore exerciser
 
-# Note: When the version changes, you also have to change the RPM spec file.
-VERS=1.3
+VERS=1.4
 
 semex: semex.c
 
@@ -19,7 +18,7 @@ clean:
 	rm -f lex.yy.c semex semex.c *~ semex.tar.gz
 	rm -f *.rpm semex-*.tar.gz semex.1 
 
-SOURCES = READ.ME semex.xml Makefile semex.c semex.spec
+SOURCES = README semex.xml Makefile semex.c semex.spec
 
 semex-$(VERS).tar.gz: $(SOURCES) semex.1
 	@ls $(SOURCES) semex.1 | sed s:^:semex-$(VERS)/: >MANIFEST
@@ -30,12 +29,8 @@ semex-$(VERS).tar.gz: $(SOURCES) semex.1
 dist: semex-$(VERS).tar.gz
 
 RPMROOT=/usr/src/redhat
-RPM = rpm
-RPMFLAGS = -ba
 rpm: dist
-	cp semex-$(VERS).tar.gz $(RPMROOT)/SOURCES;
-	cp semex.spec $(RPMROOT)/SPECS
-	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) semex.spec	
-	cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/semex-$(VERS)*.rpm .
+	rpmbuild --define 'myversion $(VERS)' -ta semex-$(VERS).tar.gz
+	cp $(RPMROOT)/RPMS/*/semex-$(VERS)*.rpm .
 	cp $(RPMROOT)/SRPMS/semex-$(VERS)*.src.rpm .