Vanilla Development Mailing List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS update: Vanilla/rpm



Date:	Thursday July 15, 1999 @ 15:25
Author:	tanner

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

Modified Files:
	Vanilla.spec cvs2rpm 
Log Message:
The server builds on RedHat 6.0 with RSA now. The RSA source does not get
distributed, so we are compliant. I do not know the legal stuff with the
Euro version, so as soon as some tells me I can download it, I'll work on 
getting the server to compile with the Euro version of the RSA source.



	* rpm/Vanilla.spec (%files): Changed the %files section for the
	server. Needed to break out each file so I could tag certain files
	as %config.

	* rpm/Vanilla.spec (clean): Added %clean to rm -f the BUILD_ROOT.

	* rpm/Vanilla.spec (RSA): Added logic to look for the RSA
	source. If it is found, extract into the right directory. The
	configure script can only detect the US RSA source, it looks for
	res-rsa/configure, which is not in the Euro version.

	* rpm/cvs2rpm (gzip): Added some documentation. Added the check
	for gzip, but left it commented out. 



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

Index: Vanilla/rpm/Vanilla.spec
diff -u Vanilla/rpm/Vanilla.spec:1.10 Vanilla/rpm/Vanilla.spec:1.11
--- Vanilla/rpm/Vanilla.spec:1.10	Thu Jul 15 03:18:33 1999
+++ Vanilla/rpm/Vanilla.spec	Thu Jul 15 15:25:03 1999
@@ -59,6 +59,24 @@
 
 %build
 
+# Look for the RSA stuff. It seems that configure only looks for the
+# US RSA code. Anyone?
+
+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
+elif [ -f $RPM_SOURCE_DIR/res-rsa-2.9.1.tar.gz.crypt ]; then
+  echo "Found RSA files, but they are encrypted, send email to rsakeys@us.netrek.org"
+  echo "for the password to decrypt the file. If you want to build the server without"
+  echo "RSA, remove $RPM_SOURCE_DIR/res-rsa-2.9.1.tar.gz.crypt and run rpm again."
+  exit 1
+fi
+
+
+# Extract the RSA source if we found it
+if [ ! -z $RSA_FILE ]; then
+  zcat $RSA_FILE | tar -xvf -
+fi
+
 #
 # Build the netrek server
 #
@@ -91,6 +109,9 @@
 #cd gum
 #install -c gum $RPM_BUILD_DIR/usr/games/netrek/gum
 
+%clean
+# rm -f $RPM_BUILD_ROOT
+
 %post
 chkconfig --add netrek
 
@@ -133,7 +154,43 @@
 %ghost /var/log/netrek/logfile
 %ghost /var/log/netrek/mesg.LOG
 %ghost /var/log/netrek/start.LOG
-/usr/games/netrek
+%config /usr/games/netrek/.planets
+%config /usr/games/netrek/.features
+%config /usr/games/netrek/.motd_clue
+%config /usr/games/netrek/motd_clue_logo.MASTER
+%config /usr/games/netrek/motd_basep_logo.MASTER
+%config /usr/games/netrek/.sysdef
+%config /usr/games/netrek/.motd
+%config /usr/games/netrek/motd_logo.MASTER
+%config /usr/games/netrek/.ports
+%config /usr/games/netrek/.time
+%config /usr/games/netrek/.motd_basep
+%config /usr/games/netrek/.reserved
+%config /usr/games/netrek/.tourn.map
+%config /usr/games/netrek/.nocount
+%config /usr/games/netrek/.banned
+%config /usr/games/netrek/.bypass
+%config /usr/games/netrek/.clue-bypass
+/usr/games/netrek/ntserv
+/usr/games/netrek/daemonII
+/usr/games/netrek/puck
+/usr/games/netrek/mars
+/usr/games/netrek/robotII
+/usr/games/netrek/basep
+/usr/games/netrek/inl
+/usr/games/netrek/end_tourney.pl
+/usr/games/netrek/newstartd
+/usr/games/netrek/updated
+/usr/games/netrek/cambot
+/usr/games/netrek/rsa_keycomp
+/usr/games/netrek/rsa_key2cap
+/usr/games/netrek/pledit
+/usr/games/netrek/sequencer
+/usr/games/netrek/xsg
+/usr/games/netrek/trekon
+/usr/games/netrek/trekon.bitmap
+/usr/games/netrek/trekoff.bitmap
+/usr/games/netrek/tools
 
 %files gum
 %defattr(-, games, games)
@@ -141,6 +198,20 @@
 %changelog
 * Thu Jul 15 1999  Bob Tanner  <tanner@real-time.com>
 
+	- rpm/Vanilla.spec (%files): Changed the %files section for the
+	server. Needed to break out each file so I could tag certain files
+	as %config.
+
+	- rpm/Vanilla.spec (clean): Added %clean to rm -f the
+	BUILD_ROOT.
+
+	- rpm/Vanilla.spec (US RSA): Added logic to look for the RSA
+	source. If it is found, extract into the right directory. The
+	configure script can only detect the US RSA source, it looks for
+	res-rsa/configure, which is not in the Euro version.
+
+* Thu Jul 15 1999  Bob Tanner  <tanner@real-time.com>
+
 	- rpm/Vanilla.spec (Source1): Had to remove the
 	ftp://ftp.risc.uni-linz.ac.at/pub/netrek/src/res-rsa2.tar.Z file,
 	since US crypto law sucks and I cannot redistribute it. Still
@@ -172,4 +243,4 @@
 * 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
Index: Vanilla/rpm/cvs2rpm
diff -u Vanilla/rpm/cvs2rpm:1.3 Vanilla/rpm/cvs2rpm:1.4
--- Vanilla/rpm/cvs2rpm:1.3	Thu Jul 15 03:37:53 1999
+++ Vanilla/rpm/cvs2rpm	Thu Jul 15 15:25:03 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.3 1999/07/15 08:37:53 tanner Exp $
+# $Id: cvs2rpm,v 1.4 1999/07/15 20:25:03 tanner Exp $
 #
 
 # Change these if necessary!
@@ -18,6 +18,7 @@
 
 IFS=:
 
+# Search for cvs in your PATH
 for bin in $PATH; do
   if [ -x $bin/cvs ]; then
     cvs=$bin/cvs
@@ -29,6 +30,7 @@
   exit 1
 fi
 
+# Search for tar in your PATH
 for bin in $PATH; do
   if [ -x $bin/tar ]; then
     tar=$bin/tar
@@ -40,6 +42,7 @@
   exit 1
 fi
 
+# Search for bzip2 in your PATH
 for bin in $PATH; do
   if [ -x $bin/bzip2 ]; then
     bzip2=$bin/bzip2
@@ -51,6 +54,19 @@
   exit 1
 fi
 
+# Search for gzip in your PATH
+for bin in $PATH; do
+  if [ -x $bin/gzip ]; then
+    gzip=$bin/gzip
+  fi
+done
+
+# Probably will change to gzip
+
+#if [ -z $gzip ]; then
+#  echo "Error. Gotta have gzipinstalled. Aborting."
+#  exit 1
+#fi
 
 # Create a distribtions, tar and gzip2 it