CVS update: Vanilla

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

Date:	Wednesday July 14, 1999 @ 3:39
Author:	tanner

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

Modified Files:
	ChangeLog 
Log Message:
* rpm/Vanilla.spec (Group): Changed the Source0 from tar.gz to
tar.bz2 to fall in line with James distributions.

* rpm/cvs2rpm: Added a shell script to take the files out of cvs
and copy them into the Redhat RPM hierarchy.



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

Index: Vanilla/ChangeLog
diff -u Vanilla/ChangeLog:1.14 Vanilla/ChangeLog:1.15
--- Vanilla/ChangeLog:1.14	Tue Jul 13 20:41:54 1999
+++ Vanilla/ChangeLog	Wed Jul 14 03:39:53 1999
@@ -1,3 +1,19 @@
+
+Wed Jul 14 02:36:02 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.
+
+	* rpm/cvs2rpm: Added a shell script to take the files out of cvs
+	and copy them into the Redhat RPM hierarchy.
+
+<<<<<<< ChangeLog
+1999-07-13  Bob Tanner  <tanner@real-time.com>
+
+	* rpm/Vanilla.spec (Group): Added the %changelog section to the
+	spec file.
+
+=======
 Tue Jul 13 20:39:46 1999  Bob Tanner  <tanner@real-time.com>
 
 	* robots/robotII.c (main):  remove warning of return type on main.
@@ -6,6 +22,7 @@
 
 	* tools/update.c: removed redefination warning.
 
+>>>>>>> 1.14
 1999-07-13  Bob Tanner  <tanner@real-time.com>
 
 	* tools/ltd_dump.c (warning): removed warning of return type.
@@ -310,4 +327,4 @@
  	update_sys_defaults in updateMessages to a more appropriate
  	location - updateClient in socket.c.
 	
-	$Id: ChangeLog,v 1.14 1999/07/14 01:41:54 tanner Exp $
+	$Id: ChangeLog,v 1.15 1999/07/14 08:39:53 tanner Exp $