From 5b30a3ccba671a95303ded696659e8442a890c5e Mon Sep 17 00:00:00 2001
From: pace <pace>
Date: Fri, 20 Jul 2007 13:44:06 +0000
Subject: [PATCH] 2007-07-20  Pace Willisson  <pace@rhino.pacew.com>

	* V169

	* generate mkrpm and raceintospace.spec during autoconf

	* change version number to 0.4.2 since rpm doesn't like
	dashes in version numbers
---
 ChangeLog                                   | 9 +++++++++
 Makefile.in                                 | 4 +++-
 configure.in                                | 4 +++-
 mkrpm => mkrpm.in                           | 6 +++---
 raceintospace.spec => raceintospace.spec.in | 4 ++--
 version.c                                   | 2 +-
 6 files changed, 21 insertions(+), 8 deletions(-)
 rename mkrpm => mkrpm.in (89%)
 rename raceintospace.spec => raceintospace.spec.in (91%)

diff --git a/ChangeLog b/ChangeLog
index d38af62..3ef41dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-20  Pace Willisson  <pace@rhino.pacew.com>
+	
+	* V169
+	
+	* generate mkrpm and raceintospace.spec during autoconf
+	
+	* change version number to 0.4.2 since rpm doesn't like
+	dashes in version numbers
+
 2007-07-19  Krzysztof Kosciuszkiewicz <drvee@users.sourceforge.net>
 
 	* V168
diff --git a/Makefile.in b/Makefile.in
index 36f785f..33f5b5d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,8 @@ PROGS = $(addsuffix @EXEEXT@, \
 
 EXTRA_SOURCES = AUTHORS README COPYING DEVELOPER TODO ChangeLog \
 				raceintospace.6 \
-				configure Makefile.in race.h.in \
+				configure Makefile.in race.h.in mkrpm.in \
+				raceintospace.spec.in \
 				$(wildcard m4/*.m4) \
 				$(shell find os_macosx -name CVS -prune -o -type f -print) \
 				os_win32/configure.mingw os_win32/Shuttle.ico \
@@ -137,6 +138,7 @@ clean:
 
 distclean: clean
 	rm -f config.log config.cache config.status Makefile
+	rm -f mkrpm raceintospace.spec
 	rm -f int_types.h race.h
 	rm -f configure
 	rm -rf autom4te.cache
diff --git a/configure.in b/configure.in
index b8e781a..f3853bd 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl ===========================
 dnl === Initialize autoconf ===
 dnl ===========================
 
-AC_INIT(Race Into Space,0.4-2,mkmccarty@raceintospace.org,raceintospace)
+AC_INIT(Race Into Space,0.4.2,mkmccarty@raceintospace.org,raceintospace)
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -143,4 +143,6 @@ AC_CONFIG_HEADER(race.h)
 if test -n "$build_win" ; then 
 	AC_CONFIG_FILES(installer.nsi, chmod a-w installer.nsi)
 fi
+AC_CONFIG_FILES(mkrpm raceintospace.spec, chmod a+x mkrpm)
+
 AC_OUTPUT(Makefile, chmod a-w Makefile race.h)
diff --git a/mkrpm b/mkrpm.in
similarity index 89%
rename from mkrpm
rename to mkrpm.in
index 81d9549..71b45fd 100755
--- a/mkrpm
+++ b/mkrpm.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-name=raceintospace
-ver=0.4
+name=@PACKAGE_TARNAME@
+ver=@PACKAGE_VERSION@
 
 name_ver=${name}-${ver}
 
@@ -9,7 +9,7 @@ make tar
 cp ${name_ver}.tar.gz ~/rpmbuild/SOURCES/.
 
 (
-    sed "s/@VER@/$ver/" < $name.spec
+    cat ${name}.spec
     find /usr/local/share/raceintospace -type f -print | sed 's:/local::'
 ) > ~/rpmbuild/SPECS/$name.spec
 
diff --git a/raceintospace.spec b/raceintospace.spec.in
similarity index 91%
rename from raceintospace.spec
rename to raceintospace.spec.in
index c56b588..6f07dfa 100644
--- a/raceintospace.spec
+++ b/raceintospace.spec.in
@@ -1,5 +1,5 @@
-Name:           raceintospace
-Version:        @VER@
+Name:           @PACKAGE_TARNAME@
+Version:        @PACKAGE_VERSION@
 Release:        1%{?dist}
 Summary:        A strategy game
 
diff --git a/version.c b/version.c
index 4bbe724..490bc9f 100644
--- a/version.c
+++ b/version.c
@@ -1,2 +1,2 @@
-168
+169