CVS update: Vanilla/rpm

[Vanilla CVS Development <vanilla-devel@us.netrek.org>]

Date:	Friday July 16, 1999 @ 8:31
Author:	cameron

Update of /home/netrek/cvsroot/Vanilla/rpm
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv12682/rpm

Modified Files:
	Vanilla.spec cvs2rpm netrek.init 
Log Message:
Late night Quozl changes ...
	- make a netrekd replacement for newstartd,
	- adjust RPM build for use of netrekd,
	- remove manifest,
	- rework primary Makefile,
	- drop bzip2 for gzip.

Details in ChangeLog ... which I reckon is too big for here.


****************************************

Index: Vanilla/rpm/Vanilla.spec
diff -u Vanilla/rpm/Vanilla.spec:1.13 Vanilla/rpm/Vanilla.spec:1.14
--- Vanilla/rpm/Vanilla.spec:1.13	Fri Jul 16 03:20:12 1999
+++ Vanilla/rpm/Vanilla.spec	Fri Jul 16 08:31:16 1999
@@ -6,7 +6,7 @@
 Packager: Vanilla Server Development Team <http://vanilla.us.netrek.org>
 URL: http://vanilla.us.netrek.org
 Group: Amusements/Games
-Source0: ftp://ftp.netrek.org/pub/netrek/servers/vanilla/Vanilla-%{version}.tar.bz2
+Source0: ftp://ftp.netrek.org/pub/netrek/servers/vanilla/Vanilla-%{version}.tar.gz
 Source1: netrek.init
 Source2: netrek.logrotate
 Source3: netrek.crontab
@@ -106,6 +106,7 @@
 install -d $RPM_BUILD_ROOT/var/log/netrek
 
 make LIBDIR=$RPM_BUILD_ROOT/usr/games/netrek install
+ln -s $RPM_BUILD_ROOT/usr/games/netrek/netrekd $RPM_BUILD_ROOT/usr/bin/netrekd
 install -m 0644 $RPM_SOURCE_DIR/netrek.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/netrek
 install -m 0555 $RPM_SOURCE_DIR/netrek.init $RPM_BUILD_ROOT/etc/rc.d/init.d/netrek
 install -m 0555 $RPM_SOURCE_DIR/netrek.crontab $RPM_BUILD_ROOT/etc/cron.hourly/netrek
@@ -118,7 +119,7 @@
 #install -c gum $RPM_BUILD_DIR/usr/games/netrek/gum
 
 %clean
-rm -f $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
 chkconfig --add netrek
Index: Vanilla/rpm/cvs2rpm
diff -u Vanilla/rpm/cvs2rpm:1.5 Vanilla/rpm/cvs2rpm:1.6
--- Vanilla/rpm/cvs2rpm:1.5	Fri Jul 16 03:20:13 1999
+++ Vanilla/rpm/cvs2rpm	Fri Jul 16 08:31:16 1999
@@ -5,7 +5,7 @@
 #
 # Make sure you check and set your VS and VL variable to get this to work.
 #
-# $Id: cvs2rpm,v 1.5 1999/07/16 08:20:13 tanner Exp $
+# $Id: cvs2rpm,v 1.6 1999/07/16 13:31:16 cameron Exp $
 #
 
 # Change these if necessary!
@@ -42,18 +42,6 @@
   exit 1
 fi
 
-# Search for bzip2 in your PATH
-for bin in $PATH; do
-  if [ -x $bin/bzip2 ]; then
-    bzip2=$bin/bzip2
-  fi
-done
-
-if [ -z $bzip2 ]; then
-  echo "Error. Gotta have bzip2 installed. Aborting."
-  exit 1
-fi
-
 # Search for gzip in your PATH
 for bin in $PATH; do
   if [ -x $bin/gzip ]; then
@@ -61,15 +49,18 @@
   fi
 done
 
-# Probably will change to gzip
+if [ -z $gzip ]; then
+  echo "Error. Gotta have gzip installed. Aborting."
+  exit 1
+fi
 
-#if [ -z $gzip ]; then
-#  echo "Error. Gotta have gzipinstalled. Aborting."
-#  exit 1
-#fi
+# check we can write to source tree
+if [ ! -d $RPM_SOURCE_DIR -o ! -w $RPM_SOURCE_DIR ]; then
+  echo "Error. $RPM_SOURCE_DIR is not a directory or I cannot write to it. Aborting"
+  exit 1
+fi
 
 # Create a distribtions, tar and bzip2 it
-
 echo "Creating distribution. This could take a couple of minutes."
 $cvs -z9 export -d Vanilla-$VS -D today Vanilla > /dev/null
 if [ $? -ne 0 ]; then
@@ -83,20 +74,15 @@
   exit 1
 fi
 
-$bzip2 -9v Vanilla-$VS.tar > /dev/null
+$gzip -9v Vanilla-$VS.tar > /dev/null
 if [ $? -ne 0 ]; then
-  echo "Error. bzip2 failed. Aborting."
+  echo "Error. gzip failed. Aborting."
   exit 1
 fi
 
 echo "Distribution created. Moving files into rpm hierarchy."
-
-if [ ! -d $RPM_SOURCE_DIR -o ! -w $RPM_SOURCE_DIR ]; then
-  echo "Error. $RPM_SOURCE_DIR is not a directory or I cannot write to it. Aborting"
-  exit 1
-fi
 
-mv Vanilla-$VS.tar.bz2 $RPM_SOURCE_DIR
+mv Vanilla-$VS.tar.gz $RPM_SOURCE_DIR
 if [ $? -ne 0 ]; then
   echo "Cannot move server source to $RPM_SOURCE_DIR. Aborting."
   exit 1
@@ -120,6 +106,6 @@
 echo "Cleaning up."
 rm -rf  Vanilla-$VS
 
-echo "To build a RPM, do the following:"
+echo "To build an RPM, do the following:"
 echo "cd $RPM_SPEC_DIR"
 echo "rpm -ba Vanilla.spec"
Index: Vanilla/rpm/netrek.init
diff -u Vanilla/rpm/netrek.init:1.2 Vanilla/rpm/netrek.init:1.3
--- Vanilla/rpm/netrek.init:1.2	Fri Jul 16 03:20:13 1999
+++ Vanilla/rpm/netrek.init	Fri Jul 16 08:31:16 1999
@@ -21,24 +21,24 @@
 
 # Check for netrek server binaries
 [ -f /usr/games/netrek/updated ] || exit 0
-[ -f /usr/games/netrek/newstartd ] || exit 0
+[ -f /usr/bin/netrekd ] || exit 0
 
 # See how we were called.
 case "$1" in
   start)
 	# Start the server.
-
 	echo -n "Starting netrek server: "
-	su -c "/usr/games/netrek/updatekeys" games
-	daemon 'su -c "/usr/games/netrek/newstartd >> /var/log/netrek/newstartd.LOG 2>&1" games'
-	echo
+	daemon 'su -c netrekd games'
+	echo -n "netrekd "
+        su -c "/usr/games/netrek/updatekeys" games
+	echo "updated "
 	touch /var/lock/subsys/netrek
 	;;
   stop)
 	# Stop the server.
 	echo -n "Shutting down netrek server: "
-	killproc newstartd
-	echo
+	daemon 'su -c "netrekd stop" games'
+	echo "netrekd "
 	rm -f /var/lock/subsys/netrek
 	;;
   restart)