New build machinery.

diff --git a/Makefile b/Makefile
index 9310ae739ad1924ce2c7dc7b363310457e008efe..348f44f882fd074ef5b57877545ccbd5c209dd01 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # Makefile for blue, the Blue Moon solitaire game
 
-# Note: When the version changes, you also have to change the RPM spec file
-VERS=2.6
+VERS=2.7
 
 SOURCES = READ.ME COPYING Makefile blue.c blue.xml *.spec
 CFLAGS=-O
@@ -31,11 +30,7 @@ uninstall:
 dist: blue-$(VERS).tar.gz
 
 RPMROOT=/usr/src/redhat
-RPM = rpm
-RPMFLAGS = -ba
 rpm: dist
-       cp blue-$(VERS).tar.gz $(RPMROOT)/SOURCES;
-       cp blue.spec $(RPMROOT)/SPECS
-       cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) blue.spec       
-       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/blue-$(VERS)*.rpm .
+       rpmbuild --define 'myversion $(VERS)' -ta blue-$(VERS).tar.gz
+       cp $(RPMROOT)/RPMS/*/blue-$(VERS)*.rpm .
        cp $(RPMROOT)/SRPMS/blue-$(VERS)*.src.rpm .

diff --git a/bluemoon.spec b/bluemoon.spec
index a7e84e82143250ee102a9d5715305a72c3a6ac08..703c947856b3c84ce76d599509e10850414eff8e 100644 (file)
--- a/bluemoon.spec
+++ b/bluemoon.spec
@@ -1,8 +1,8 @@
 Name: blue
 Summary: Blue Moon solitaire (text mode)
-Version: 2.6
+Version: %{myversion}
 Release: 1
-URL: http://www.tuxedo.org/~esr/
+URL: http://www.tuxedo.org/~esr/blue/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Games
@@ -28,6 +28,11 @@ make
 %install
 make install
 
+%changelog
+
+* Wed Dec 24 2003 Eric S. Raymond <esr@snark.thyrsus.com> 
+- Fixed build machinery to use rpmbuild.
+
 %files
 /usr/share/man/man6/blue.6
 /usr/bin/blue