CVS update: Vanilla/rpm

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

Date:	Friday July 16, 1999 @ 18:00
Author:	tanner

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

Modified Files:
	Vanilla.spec netrek.init 
Log Message:
	* rpm/Vanilla.spec (files): /usr/games/netrek gets installed owned
	by root by default. Change ownership to games.

	* rpm/Vanilla.spec (files): updatekeys wants to write to a file
	called /usr/games/netrek/rsa_key. Touch the file and add it to the
	files section.

	* rpm/netrek.init: Wrong path to updatekeys. daemon does not work
	when you pass it "su -c", changed to run server by hand. Added
	redirection of output from netrekd/newstartd to the logfile
	/var/log/netrek/newstard.LOG

	* rpm/Vanilla.spec (Requires): gtk+ not gtk.



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

Index: Vanilla/rpm/Vanilla.spec
diff -u Vanilla/rpm/Vanilla.spec:1.15 Vanilla/rpm/Vanilla.spec:1.16
--- Vanilla/rpm/Vanilla.spec:1.15	Fri Jul 16 16:04:55 1999
+++ Vanilla/rpm/Vanilla.spec	Fri Jul 16 18:00:33 1999
@@ -11,7 +11,7 @@
 Source2: netrek.logrotate
 Source3: netrek.crontab
 Prereq: sed, vixie-cron, sh-utils
-Requires: gtk > 1.2, glib > 1.2, vixie-cron, sed, sh-utils
+Requires: gtk+ > 1.2, glib > 1.2, vixie-cron, sed, sh-utils
 BuildRoot: /var/tmp/netrek-buildroot
 
 %description
@@ -60,10 +60,12 @@
 # Look for the US RSA stuff.
 if [ -f $RPM_SOURCE_DIR/res-rsa-2.9.1.tar.gz ]; then
   RSA_FILE=$RPM_SOURCE_DIR/res-rsa-2.9.1.tar.gz
+  RSA_RELEASE=2.9.1
 
 # Look for the Euro RSA stuff.
 elif [ -f $RPM_SOURCE_DIR/res-rsa-2.9.tar.gz ]; then
   RSA_FILE=$RPM_SOURCE_DIR/res-rsa-2.9.tar.gz
+  RSA_RELEASE=2.9
 
 # Could not find either, does the user have the file encrypted?
 elif [ -f $RPM_SOURCE_DIR/res-rsa-2.9.1.tar.gz.crypt ]; then
@@ -80,6 +82,7 @@
 
 # Extract the RSA source if we found it
 if [ ! -z $RSA_FILE ]; then
+  ln -s res-rsa res-rsa-$RSA_RELEASE
   zcat $RSA_FILE | tar -xvf -
 fi
 
@@ -112,6 +115,7 @@
 # Create the ghost of netrekd. The %post will do the actual symlink on
 # install.
 touch $RPM_BUILD_ROOT/usr/bin/netrekd
+touch $RPM_BUILD_ROOT/usr/games/netrek/rsa_key
 
 for f in god.LOG log logfile mesg.LOG newstartd.LOG updated.LOG; do
   touch $RPM_BUILD_ROOT/var/log/netrek/$f
@@ -139,6 +143,7 @@
 /etc/rc.d/init.d/netrek
 
 %defattr(-, games, games)
+%dir /usr/games/netrek
 %dir /var/log/netrek
 %ghost /var/log/netrek/god.LOG
 %ghost /var/log/netrek/log
@@ -164,6 +169,7 @@
 %config /usr/games/netrek/.bypass
 %config /usr/games/netrek/.clue-bypass
 /etc/cron.hourly/netrek
+/usr/games/netrek/rsa_key
 /usr/games/netrek/ntserv
 /usr/games/netrek/daemonII
 /usr/games/netrek/puck
Index: Vanilla/rpm/netrek.init
diff -u Vanilla/rpm/netrek.init:1.4 Vanilla/rpm/netrek.init:1.5
--- Vanilla/rpm/netrek.init:1.4	Fri Jul 16 16:04:55 1999
+++ Vanilla/rpm/netrek.init	Fri Jul 16 18:00:33 1999
@@ -28,15 +28,15 @@
   start)
 	# Start the server.
 	echo -n "Starting netrek server: "
-        su -c "/usr/games/netrek/updatekeys" - games
-	daemon 'su -c "netrekd" - games'
+        su -c "/usr/games/netrek/tools/updatekeys" - games
+	su -c "netrekd >> /var/log/netrek/newstartd.LOG 2>&1" - games
 	echo 
 	touch /var/lock/subsys/netrek
 	;;
   stop)
 	# Stop the server.
 	echo -n "Shutting down netrek server: "
-	su -c "netrekd stop" - games
+	su -c "netrekd stop >> /var/log/netrek/newstartd.LOG 2>&1" - games
 	echo
 	rm -f /var/lock/subsys/netrek
 	;;