From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 29 Dec 2003 11:06:21 +0000 (+0000)
Subject: First step of RPM cleanup.
X-Git-Tag: 1.5
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=4a128ee001e0eb143a2166a3a836595f0076fa94;p=vms-empire.git

First step of RPM cleanup.
---

diff --git a/BUGS b/BUGS
index 0edffe6..e2fecd3 100644
--- a/BUGS
+++ b/BUGS
@@ -588,3 +588,21 @@ savefile name.
 immediately if the game has been saved.  If the game hasn't been
 saved, the user should be told, and asked if she really wants to
 quit.
+
+5) "Andrew Morrow" <amorrow@nouveausystems.com> reported this in 
+August 2002:
+
+I am playing the version of vms-empire that you claim in your READ-ME
+to maintain.  I noticed a bug vms-empire that I think you should
+know.  Sometimes the program exits in util.c/check_cargo() at the line
+
+    ASSERT (q->owner == p->owner);
+
+At least one case where this can happen is when two opposing
+transports meet at sea.  Somehow, an army can transfer to an enemy
+transport.  I have not examined the exact line this happens on (maybe
+while attempting to attack the enemy transport or while executing its
+function to move a in particular direction?)  but I have saved such a
+game, commented out this line, landed my transport (which has a
+computer army on board), and seen the computer army exit my
+transport.
diff --git a/Makefile b/Makefile
index 0ad4489..74bff0e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 # and warranty information.
 
 # Note: When the version changes, you also have to change the RPM spec file.
-VERS=1.4
+VERS=1.5
 
 # Change the line below for your system.  If you are on a Sun or Vax,
 # you may want BSD.
@@ -77,7 +77,7 @@ lint: $(FILES)
 	lint -u -D$(SYS) $(FILES) -lcurses
 
 clean:
-	rm -f *.o TAGS
+	rm -f *.o TAGS vms-empire
 
 clobber: clean
 	rm -f vms-empire vms-empire-*.tar*
@@ -93,7 +93,7 @@ vms-empire-$(VERS).tar.gz: $(SOURCES) vms-empire.6
 dist: vms-empire-$(VERS).tar.gz
 
 RPMROOT=/usr/src/redhat
-RPM = rpm
+RPM = rpmbuild
 RPMFLAGS = -ba
 rpm: dist
 	cp vms-empire-$(VERS).tar.gz $(RPMROOT)/SOURCES;
diff --git a/vms-empire.spec b/vms-empire.spec
index 4bccaf5..9e5c4c7 100644
--- a/vms-empire.spec
+++ b/vms-empire.spec
@@ -1,11 +1,12 @@
 Name: vms-empire
-Version: 1.4
+Version: 1.5
 Release: 1
 URL: http://www.tuxedo.org/~esr/vms-empire/
 Source: %{name}-%{version}.tar.gz
 License: GPL-like
 Group: Games
 Summary: Solitaire Empire (sometimes called `VMS Empire')
+%undefine __check_files
 
 %description
 Empire is a simulation of a full-scale war between two
@@ -25,7 +26,12 @@ make
 cp vms-empire /usr/bin
 cp vms-empire.6 /usr/share/man/man6/vms-empire.6
 
+%changelog
+* Tue Dec 16 2003 Eric S. Raymond <esr@snark.thyrsus.com> 1.5-1
+- Cleanup release with new build machinery.
+
 %files
 /usr/share/man/man6/vms-empire.6
 /usr/bin/vms-empire
 %doc READ.ME NEWS
+