Vanilla Development Mailing List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS update: Vanilla/rpm
Date: Monday July 26, 1999 @ 1:32
Author: tanner
Update of /home/netrek/cvsroot/Vanilla/rpm
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv15589/rpm
Modified Files:
cvs2rpm netrek.spec
Added Files:
netrek.gnome netrek.png
Log Message:
The GNOME additions are NOT made for a production server. We still have some
issues to work about about UIDs and administration privledges. Biggest problem
is the server runs as user games, a typical admin will log in as a normal user
like tanner. If tanner runs netrekcfg, he will not be able to admin the server
when all files, processes are owned by games.
* rpm/netrek.spec (preun): Do a check to see if the server is
running, if it us, then shut it down THEN proceed with the
uninstall.
Added a little message that tells the user that the inability to
remove files is ok.
* rpm/netrek.spec (netrekcfg): Setuid games to the netrekcfg
binary so "normal" users can admin the netrek server.
* rpm/netrek.spec (GNOME): Added GNOME menu option for netrekcfg.
****************************************
Index: Vanilla/rpm/cvs2rpm
diff -u Vanilla/rpm/cvs2rpm:1.9 Vanilla/rpm/cvs2rpm:1.10
--- Vanilla/rpm/cvs2rpm:1.9 Thu Jul 22 18:09:39 1999
+++ Vanilla/rpm/cvs2rpm Mon Jul 26 01:32:18 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.9 1999/07/22 23:09:39 tanner Exp $
+# $Id: cvs2rpm,v 1.10 1999/07/26 06:32:18 tanner Exp $
#
# Change these if necessary!
@@ -88,7 +88,7 @@
exit 1
fi
-for i in init logrotate crontab functions keys; do
+for i in init logrotate crontab functions keys png gnome; do
cp netrek.$i $RPM_SOURCE_DIR
if [ $? -ne 0 ]; then
echo "Cannot cp netrek.$ to $RPM_SOURCE_DIR. Aborting."
@@ -108,4 +108,4 @@
echo "To build an RPM, do the following:"
echo "cd $RPM_SPEC_DIR"
-echo "rpm -ba netrek.spec"
\ No newline at end of file
+echo "rpm -ba netrek.spec"
Index: Vanilla/rpm/netrek.spec
diff -u Vanilla/rpm/netrek.spec:1.2 Vanilla/rpm/netrek.spec:1.3
--- Vanilla/rpm/netrek.spec:1.2 Sun Jul 25 20:57:42 1999
+++ Vanilla/rpm/netrek.spec Mon Jul 26 01:32:18 1999
@@ -12,6 +12,8 @@
Source3: netrek.crontab
Source4: netrek.keys
Source5: netrek.functions
+Source6: netrek.gnome
+Source7: netrek.png
BuildRoot: /var/tmp/netrek-buildroot
%description
@@ -141,6 +143,8 @@
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/pixmaps
#
# Use INSTALLOPTS="-s" if you want the binaries stripped.
@@ -153,6 +157,12 @@
install -m 0644 $RPM_SOURCE_DIR/netrek.keys $RPM_BUILD_ROOT/usr/games/netrek/rsa-keyfile
#
+# 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
+
+#
# Create the ghosts. The %post will do the actual symlink on install.
#
touch $RPM_BUILD_ROOT/usr/bin/netrekd
@@ -160,7 +170,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 for get
+# touch the file in the /usr/game/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.
@@ -186,25 +196,6 @@
bindir=$RPM_BUILD_ROOT/usr/games/netrek/tools \
datadir=$RPM_BUILD_ROOT/usr/share/games/netrek
-# left here for bob the expert to fix up for me - quozl
-#
-# Prepare a GNOME application icon
-#
-# mkdir -p /usr/share/gnome/apps/Internet/
-# cat << eox > /usr/share/gnome/apps/Internet/netrekd.desktop
-# Name=Netrek Server
-# Comment=Netrek Server
-# Exec=netrekd
-# Icon=netrekd.png
-# Terminal=0
-# Type=Application
-# eox
-#
-# Install a Netrek Client icon
-#
-# mkdir -p /usr/share/pixmaps
-# cp netrekd.png /usr/share/pixmaps/
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -228,11 +219,16 @@
su -c "ln -s /var/log/netrek/mesg.LOG /usr/games/netrek/mesg.LOG" - games
%preun server
+
+echo "You might receive several messages that state:"
+echo " removal of 'filename' failed: No such file or directory"
+echo "You can ignore these messages. Thanks."
+
chkconfig --del netrek
-#if [ -f /var/lock/subsys/netrek ]; then
+if [ -f /var/lock/subsys/netrek ]; then
/etc/rc.d/init.d/netrek stop
-#fi
+fi
%postun server
@@ -309,11 +305,13 @@
/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
%files netrekcfg
%defattr(-, games, games)
%ghost /usr/bin/netrekcfg
-/usr/games/netrek/tools/gum
+%attr(4111, games, games)/usr/games/netrek/tools/gum
/usr/share/games/netrek
%ghost /usr/games/netrek/tools/pixmaps
@@ -378,4 +376,3 @@
* Wed Jul 14 1999 Bob Tanner <tanner@real-time.com>
- rpm/Vanilla.spec (Group): Changed the Source0 from tar.gz to
tar.bz2 to fall in line with James distributions.
-
\ No newline at end of file