From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 24 Dec 2003 21:34:28 +0000 (+0000)
Subject: Ready for 2.5 release.
X-Git-Tag: 2.5~3
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=fe95cb8295a1fe82d925cf1f6b1019aed80bd5a3;p=bs.git

Ready for 2.5 release.
---

diff --git a/Makefile b/Makefile
index 1878259..17a0916 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
 #	Makefile for bs, the Battleships game
 
-# Note: When the version changes, you also have to change
-#  * the name of the containing directory
-#  * the RPM spec file
-VERSION=2.4
+# Note: When the version changes, you also have to change the RPM spec file
+VERSION=2.5
 
 # Flags for use with the Linux ncurses package (recommended)
 TERMLIB = -lncurses
@@ -40,12 +38,8 @@ bs-$(VERSION).tar.gz: $(SOURCES) bs.6
 dist: bs-$(VERSION).tar.gz
 
 RPMROOT=/usr/src/redhat
-RPM = rpm
-RPMFLAGS = -ba
 rpm: dist
-	cp bs-$(VERSION).tar.gz $(RPMROOT)/SOURCES;
-	cp bs.spec $(RPMROOT)/SPECS
-	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) bs.spec	
-	cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/bs-$(VERSION)*.rpm .
-	cp $(RPMROOT)/SRPMS/bs-$(VERSION)*.src.rpm .
+	rpmbuild -ta bs-$(VERS).tar.gz
+	cp $(RPMROOT)/RPMS/*/bs-$(VERS)*.rpm .
+	cp $(RPMROOT)/SRPMS/bs-$(VERS)*.src.rpm .
 
diff --git a/README b/README
index 429d684..30899a1 100644
--- a/README
+++ b/README
@@ -35,4 +35,4 @@ November 1993: I've added function key support, and ANSI/POSIXized the code.
 
 					Eric S. Raymond
 					esr@snark.thyrsus.com
-				(WWW: http://www.tuxedo.org/~esr/home.html)
+				(WWW: http://www.catb.org/~esr/home.html)
diff --git a/bs.c b/bs.c
index c8a0287..0fb5e8a 100644
--- a/bs.c
+++ b/bs.c
@@ -3,13 +3,8 @@
  *		salvo option by: Chuck A DeGaul
  * with improved user interface, autoconfiguration and code cleanup
  *		by Eric S. Raymond <esr@snark.thyrsus.com>
- * v1.2 with color support and minor portability fixes, November 1990
- * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
- * v2.1 with ncurses mouse support, September 1995
- * v2.2 code cleanup.
- * v2.3 bug fixes by Erik Sigra.
  *
- * $Id: bs.c,v 1.8 1998/08/14 03:53:19 esr Exp esr $
+ * $Id: bs.c,v 1.9 2001/05/07 20:27:59 esr Exp esr $
  */
 
 #include <curses.h>
diff --git a/bs.spec b/bs.spec
index 35585e5..402310c 100644
--- a/bs.spec
+++ b/bs.spec
@@ -1,11 +1,13 @@
 Name: bs
 Summary: Battleships against the computer (character-cell graphics)
-Version: 2.4
+Version: %{myversion}
 Release: 1
-URL: http://www.tuxedo.org/~esr/
+URL: http://www.tuxedo.org/~esr/bs/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Games
+%undefine __check_files
+
 %description
 The classic game of Battleships against the computer.
 Uses character-cell graphics with a visual point-and-shoot interface.
@@ -24,3 +26,14 @@ make install
 /usr/share/man/man6/bs.6
 /usr/bin/bs
 %doc READ.ME COPYING
+
+%changelog
+* Wed Dec 24 2003 Eric S. Raymond <esr@snark.thyrsus.com> 
+- Improved packaging.
+
+ * v1.2 with color support and minor portability fixes, November 1990
+ * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
+ * v2.1 with ncurses mouse support, September 1995
+ * v2.2 code cleanup.
+ * v2.3 bug fixes by Erik Sigra.
+ * v2.4 Update the RPM production.