CVS update: Vanilla/rpm

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

Date:	Friday July 16, 1999 @ 16:04
Author:	tanner

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

Modified Files:
	Vanilla.spec netrek.crontab netrek.init 
Log Message:
	* rpm/netrek.init: Need to update the keys before starting the
	server. Under RedHat 6.0, you no longer need to identify the
	process that are about to be run. Ie, this is not needed:

	echo "Starting myserver..."
	daemon myserver
	echo -n "myserver"

	RedHat 6.0's runlevel is different then anything before it.

	* rpm/netrek.crontab: Added the 2nd "-" to give us a clean shell
	environment. 

	* rpm/Vanilla.spec (%install): You cannot do full path symlink in
	the %install section of a spec file when you are using a
	BuildRoot. Because the $RPM_BUILD_ROOT is macro that get expanded
	to the BuildRoot definition (located at the top of the spec
	file). If you need to symlink something use relative paths or put
	the ln into the %post section.



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

Index: Vanilla/rpm/Vanilla.spec
diff -u Vanilla/rpm/Vanilla.spec:1.14 Vanilla/rpm/Vanilla.spec:1.15
--- Vanilla/rpm/Vanilla.spec:1.14	Fri Jul 16 08:31:16 1999
+++ Vanilla/rpm/Vanilla.spec	Fri Jul 16 16:04:55 1999
@@ -55,8 +55,6 @@
 %prep
 %setup
 
-#Source1: ftp://ftp.risc.uni-linz.ac.at/pub/netrek/src/res-rsa2.tar.Z
-
 %build
 
 # Look for the US RSA stuff.
@@ -104,13 +102,17 @@
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT/etc/cron.hourly
 install -d $RPM_BUILD_ROOT/var/log/netrek
+install -d $RPM_BUILD_ROOT/usr/bin
 
 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
 
+# Create the ghost of netrekd. The %post will do the actual symlink on
+# install.
+touch $RPM_BUILD_ROOT/usr/bin/netrekd
+
 for f in god.LOG log logfile mesg.LOG newstartd.LOG updated.LOG; do
   touch $RPM_BUILD_ROOT/var/log/netrek/$f
 done
@@ -123,9 +125,11 @@
 
 %post
 chkconfig --add netrek
+ln -s /usr/games/netrek/newstartd /usr/bin/netrekd
 
 %postun
 chkconfig --del netrek
+rm -f /usr/bin/netrekd
 
 %files
 %defattr(-, root, root)
@@ -169,6 +173,8 @@
 /usr/games/netrek/inl
 /usr/games/netrek/end_tourney.pl
 /usr/games/netrek/newstartd
+%ghost /usr/bin/netrekd
+/usr/games/netrek/netrekd
 /usr/games/netrek/updated
 /usr/games/netrek/cambot
 /usr/games/netrek/rsa_keycomp
Index: Vanilla/rpm/netrek.crontab
diff -u Vanilla/rpm/netrek.crontab:1.3 Vanilla/rpm/netrek.crontab:1.4
--- Vanilla/rpm/netrek.crontab:1.3	Fri Jul 16 03:20:13 1999
+++ Vanilla/rpm/netrek.crontab	Fri Jul 16 16:04:55 1999
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-su -c "/usr/games/netrek/tools/updatekeys" games
+su -c "/usr/games/netrek/tools/updatekeys" - games
Index: Vanilla/rpm/netrek.init
diff -u Vanilla/rpm/netrek.init:1.3 Vanilla/rpm/netrek.init:1.4
--- Vanilla/rpm/netrek.init:1.3	Fri Jul 16 08:31:16 1999
+++ Vanilla/rpm/netrek.init	Fri Jul 16 16:04:55 1999
@@ -28,17 +28,16 @@
   start)
 	# Start the server.
 	echo -n "Starting netrek server: "
-	daemon 'su -c netrekd games'
-	echo -n "netrekd "
-        su -c "/usr/games/netrek/updatekeys" games
-	echo "updated "
+        su -c "/usr/games/netrek/updatekeys" - games
+	daemon 'su -c "netrekd" - games'
+	echo 
 	touch /var/lock/subsys/netrek
 	;;
   stop)
 	# Stop the server.
 	echo -n "Shutting down netrek server: "
-	daemon 'su -c "netrekd stop" games'
-	echo "netrekd "
+	su -c "netrekd stop" - games
+	echo
 	rm -f /var/lock/subsys/netrek
 	;;
   restart)