From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 29 Dec 2003 07:15:53 +0000 (+0000)
Subject: RPM packaging fixes.
X-Git-Tag: 2.7
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=9d4a085257f9cf57d2d5ce085c69c2725321b16b;p=bs.git

RPM packaging fixes.
---

diff --git a/Makefile b/Makefile
index 630454b..8bcd95f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 #	Makefile for bs, the Battleships game
 
-VERSION=2.6
+VERSION=$(shell sed <bs.spec -n -e '/Version: \(.*\)/s//\1/p')
 
 # Flags for use with the Linux ncurses package (recommended)
 TERMLIB = -lncurses
 CC = gcc
 
+# DESTDIR support
+DESTDIR = 
+
 bs: bs.c
 	$(CC) $(CFLAGS) -o bs bs.c $(TERMLIB)
 
@@ -16,13 +19,13 @@ clean:
 	rm -f bs bs.6 bs*.tar.gz bs*.rpm *~
 
 install: bs.6 uninstall
-	cp bs /usr/bin
-	cp bs.6 /usr/share/man/man6/bs.6
+	cp bs $(DESTDIR)/usr/bin
+	cp bs.6 $(DESTDIR)/usr/share/man/man6/bs.6
 
 uninstall:
 	rm -f /usr/bin/bs /usr/share/man/man6/bs.6
 
-SOURCES = READ.ME COPYING bs.c Makefile bs.xml bs.spec
+SOURCES = README COPYING bs.c Makefile bs.xml bs.spec
 
 bs-$(VERSION).tar.gz: $(SOURCES) bs.6
 	@ls $(SOURCES) bs.6 | sed s:^:bs-$(VERSION)/: >MANIFEST
@@ -31,10 +34,3 @@ bs-$(VERSION).tar.gz: $(SOURCES) bs.6
 	@(cd ..; rm bs-$(VERSION))
 
 dist: bs-$(VERSION).tar.gz
-
-RPMROOT=/usr/src/redhat
-rpm: dist
-	rpmbuild --define 'myversion $(VERSION)' -ta bs-$(VERSION).tar.gz
-	cp $(RPMROOT)/RPMS/*/bs-$(VERSION)*.rpm .
-	cp $(RPMROOT)/SRPMS/bs-$(VERSION)*.src.rpm .
-
diff --git a/README b/README
index 30899a1..f21ebbd 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.catb.org/~esr/home.html)
+				(WWW: http://www.catb.org/~esr/)
diff --git a/bs.spec b/bs.spec
index 052e08e..2a23a3c 100644
--- a/bs.spec
+++ b/bs.spec
@@ -1,12 +1,12 @@
 Name: bs
 Summary: Battleships against the computer (character-cell graphics)
-Version: %{myversion}
+Version: 2.7
 Release: 1
 URL: http://www.catb.org/~esr/bs/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Games
-%undefine __check_files
+BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 The classic game of Battleships against the computer.
@@ -20,15 +20,25 @@ If you're using an xterm under Linux the mouse will work.
 make
 
 %install
-make install
-
+[ ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+mkdir -p "$RPM_BUILD_ROOT"/usr/bin
+mkdir -p "$RPM_BUILD_ROOT"/usr/share/man/man6/
+cp bs "$RPM_BUILD_ROOT"/usr/bin
+cp bs.6 "$RPM_BUILD_ROOT"/usr/share/man/man6/
+
+%clean
+[ ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
 %files
-/usr/share/man/man6/bs.6
-/usr/bin/bs
-%doc READ.ME COPYING
+%defattr(-,root,root,-)
+%{_mandir}/man6/bs.6*
+%{_bindir}/bs
+%doc README COPYING
 
 %changelog
-* Fri Dec 26 2003 Eric S. Raymond <esr@snark.thyrsus.com> d2.6
+* Mon Dec 29 2003 Eric S. Raymond <esr@snark.thyrsus.com> 2.7-1
+- Source RPMS no longer depend on myversion define.
+
+* Fri Dec 26 2003 Eric S. Raymond <esr@snark.thyrsus.com> 2.6
 - Fix a broken URL in the documentation
 
 * Wed Dec 24 2003 Eric S. Raymond <esr@snark.thyrsus.com> 2.5