From c2ec0bc21e563780fea084ab6d1c18b0f23fce89 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 24 Dec 2003 20:07:33 +0000
Subject: [PATCH] New build machinery.

---
 Makefile      | 11 +++--------
 bluemoon.spec |  9 +++++++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 9310ae7..348f44f 100644
--- 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 a7e84e8..703c947 100644
--- 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
-- 
2.43.0