CVS update: Vanilla/rpm

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

Date:	Thursday December 30, 1999 @ 0:40
Author:	cameron

Update of /home/netrek/cvsroot/Vanilla/rpm
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7254/rpm

Modified Files:
	netrek.crontab netrek.gnome netrek.spec 
Log Message:
Mass changes (see ChangeLog) prior to 2.9pl4 release.


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

Index: Vanilla/rpm/netrek.crontab
diff -u Vanilla/rpm/netrek.crontab:1.5 Vanilla/rpm/netrek.crontab:1.6
--- Vanilla/rpm/netrek.crontab:1.5	Wed Jul 21 02:09:22 1999
+++ Vanilla/rpm/netrek.crontab	Thu Dec 30 00:40:02 1999
@@ -17,7 +17,7 @@
   exit 0
 fi
 
-if [ $string -gt 0 ]; then
+if [ $num -gt 0 ]; then
   su -c "/usr/games/netrek/tools/updatekeys" - games
 fi
 
Index: Vanilla/rpm/netrek.gnome
diff -u Vanilla/rpm/netrek.gnome:1.1 Vanilla/rpm/netrek.gnome:1.2
--- Vanilla/rpm/netrek.gnome:1.1	Mon Jul 26 01:32:18 1999
+++ Vanilla/rpm/netrek.gnome	Thu Dec 30 00:40:02 1999
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Netrek Server
 Comment=Netrek Server
-Exec=netrekd
-Icon=netrekd.png
+Exec=netrekcfg
 Terminal=0
 Type=Application
Index: Vanilla/rpm/netrek.spec
diff -u Vanilla/rpm/netrek.spec:1.3 Vanilla/rpm/netrek.spec:1.4
--- Vanilla/rpm/netrek.spec:1.3	Mon Jul 26 01:32:18 1999
+++ Vanilla/rpm/netrek.spec	Thu Dec 30 00:40:02 1999
@@ -1,6 +1,6 @@
 Summary: Netrek Software Suite
 Name: netrek
-Version: 2.9pl3
+Version: 2.9pl4
 Release: 1
 Copyright: Undetermined
 Packager: Vanilla Server Development Team
@@ -14,6 +14,7 @@
 Source5: netrek.functions
 Source6: netrek.gnome
 Source7: netrek.png
+
 BuildRoot: /var/tmp/netrek-buildroot
 
 %description
@@ -66,13 +67,13 @@
 #
 # GUI Admin tool
 #
-%package netrekcfg
+%package config
 Summary: Netrek Vanilla Server Configuration Program
 Prereq: automake
-Requires: Vanilla, gtk+ > 1.2, glib > 1.2,  redhat-release > 5.9
+Requires: netrek-server, gtk+ > 1.2, glib > 1.2,  redhat-release > 5.9
 Group: Amusements/Games
 
-%description netrekcfg
+%description config
 Configuration program for the Netrek Vanilla Server.
 
 Although the server will run out of the box, it can be configured to
@@ -143,7 +144,7 @@
 install -d $RPM_BUILD_ROOT/var/log/netrek
 install -d $RPM_BUILD_ROOT/usr/bin
 install -d $RPM_BUILD_ROOT/usr/share/games/netrek
-install -d $RPM_BUILD_ROOT/usr/share/gnome/apps/Internet
+install -d $RPM_BUILD_ROOT/usr/share/gnome/apps/Games
 install -d $RPM_BUILD_ROOT/usr/share/pixmaps
 
 #
@@ -159,8 +160,8 @@
 #
 # Install GNOME menu items
 #
-install -m 0444 $RPM_SOURCE_DIR/netrek.gnome $RPM_BUILD_ROOT/usr/share/gnome/apps/Internet/netrekd.desktop
-install -m 0444 $RPM_SOURCE_DIR/netrek.png $RPM_BUILD_ROOT/usr/share/pixmaps/netrekd.png
+install -m 0444 $RPM_SOURCE_DIR/netrek.gnome $RPM_BUILD_ROOT/usr/share/gnome/apps/Games/netrekcfg.desktop
+#install -m 0444 $RPM_SOURCE_DIR/netrek.png $RPM_BUILD_ROOT/usr/share/pixmaps/netrekd.png
 
 #
 # Create the ghosts. The %post will do the actual symlink on install.
@@ -170,7 +171,7 @@
 
 #
 # Any file that the server creates needs to be added here so I can
-# touch the file in the /usr/game/netrek directory. Also don't forget
+# touch the file in the /usr/games/netrek directory. Also don't forget
 # to add a %ghost entry for each of these files. This is necessary so if
 # a user removes the server all files, even one generated from the
 # server are removed.
@@ -232,10 +233,10 @@
 
 %postun server
 
-%post netrekcfg
+%post config
 #ln -s /usr/games/netrek/tools/netrekcfg /usr/bin/netrekcfg
 ln -s /usr/games/netrek/tools/gum /usr/bin/netrekcfg
-su -c "ln -s /usr/share/games/netrek/gum/pixmaps /usr/games/netrek/tools/pixmaps" - games
+su -c "ln -sf /usr/share/games/netrek/gum/pixmaps /usr/games/netrek/tools/pixmaps" - games
 
 %files server
 %defattr(-, root, root)
@@ -305,14 +306,14 @@
 /usr/games/netrek/trekon.bitmap
 /usr/games/netrek/trekoff.bitmap
 /usr/games/netrek/tools
-/usr/share/gnome/apps/Internet/netrekd.desktop
-/usr/share/pixmaps/netrekd.png
+#/usr/share/pixmaps/netrekd.png
 
-%files netrekcfg
+%files config
 %defattr(-, games, games)
 %ghost /usr/bin/netrekcfg
 %attr(4111, games, games)/usr/games/netrek/tools/gum
 /usr/share/games/netrek
+/usr/share/gnome/apps/Games/netrekcfg.desktop
 %ghost /usr/games/netrek/tools/pixmaps
 
 %changelog