rpms/quake3/devel quake3.spec, 1.3, 1.4 urbanterror.autodlrc, 1.1, 1.2 urbanterror.sh, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12771

Modified Files:
	quake3.spec urbanterror.autodlrc urbanterror.sh 
Log Message:
* Sun Dec 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.6.rc4
- Update urbanterror autodlrc file to refer to version 4.1 (was 4.0)



Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quake3.spec	23 Dec 2007 14:40:07 -0000	1.3
+++ quake3.spec	23 Dec 2007 18:53:49 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           quake3
 Version:        1.34
-Release:        0.5.%{prever}%{?dist}
+Release:        0.6.%{prever}%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -104,7 +104,7 @@
 Urban Terror uses the GPL licensed ioquake3 engine, however the Urban Terror
 datafiles are not freely redistributable. This package will install an Urban
 Terror menu entry, which will automatically download the necessary datafiles
-(500 MB!) the first time you start Urban Terror.
+(700 MB!) the first time you start Urban Terror.
 
 
 %package -n worldofpadman
@@ -123,7 +123,7 @@
 World of Padman uses the GPL licensed ioquake3 engine, however the Wop data-
 files are not freely redistributable. This package will install a World of
 Padman menu entry, which will automatically download the necessary datafiles
-(500 MB!) the first time you start World of Padman.
+(600 MB!) the first time you start World of Padman.
 
 
 %prep
@@ -261,6 +261,9 @@
 
 
 %changelog
+* Sun Dec 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.6.rc4
+- Update urbanterror autodlrc file to refer to version 4.1 (was 4.0)
+
 * Sun Dec 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.5.rc4
 - Split of the demo launcher into a quake3-demo package, so that when for
   example openarena requires quake3 for the engine people don't automatically


Index: urbanterror.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/urbanterror.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- urbanterror.autodlrc	23 Dec 2007 14:40:07 -0000	1.1
+++ urbanterror.autodlrc	23 Dec 2007 18:53:49 -0000	1.2
@@ -3,7 +3,7 @@
 	[TITLE]Please click 'Accept' to allow internet access.[/TITLE]
 	[TEXT]In order to play the free multiplayer first person shooter: Urban Terror, the Urban Terror datafiles are needed. Urban Terror is a mod/total conversion based on the Quake 3 engine.
 
-Click Accept, to download the Urban Terror datafiles, which can be freely downloaded from the internet.
+Click Accept, to download the Urban Terror datafiles, which can be freely downloaded from the internet. The Urban Terror zip is around 700MB, so you need a minimum of 1.4GB free space on your HOME partition!
 [/TEXT]
 [/MESSAGE]
 [MESSAGE]
@@ -16,14 +16,16 @@
 
 [FILELIST]
 [FILE]
-	[FILENAME]UrbanTerror40_full.zip[/FILENAME]
-	[MD5]4aec86405b548b041686f92eb584cbf9[/MD5]
+	[FILENAME]UrbanTerror_41_FULL.zip[/FILENAME]
+	[MD5]1370306ea236f65f595e7ca70765e469[/MD5]
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
-		[URL]ftp://ftp.snt.utwente.nl/pub/games/urbanterror/UrbanTerror40_full.zip[/URL]
-		[URL]http://mirrormaid.yi.org/UrbanTerror40_full.zip[/URL]
-		[URL]http://mrsentry.net/release/UrbanTerror40_full.zip[/URL]
-		[URL]ftp://ftp.vectranet.pl/pub/gry/UrbanTerror/UrbanTerror40_full.zip[/URL]
+		[URL]http://vlaai.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://www.complex-microcosm.com/4711_UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://mirror.kickassctf.com/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://mrsentry.net/release/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://www.iourt.com/urt41/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://mirror.ncsa.uiuc.edu/ut4/urbanterror/UrbanTerror_41_FULL.zip[/URL]
 	[/MIRRORS]
 [/FILE]
 [/FILELIST]


Index: urbanterror.sh
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/urbanterror.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- urbanterror.sh	23 Dec 2007 14:40:07 -0000	1.1
+++ urbanterror.sh	23 Dec 2007 18:53:49 -0000	1.2
@@ -14,8 +14,11 @@
   # status 2 means download was ok, but the user choice not to start the game
   if [ "$STATUS" = "0" -o "$STATUS" = "2" ]; then
     pushd ~/.q3a > /dev/null
-    unzip -qq -u UrbanTerror40_full.zip
-    rm UrbanTerror40_full.zip
+    unzip -qq -u UrbanTerror_41_FULL.zip
+    # remove any old versions (if present) otherwise the mv fails
+    rm -fr q3ut4
+    mv UrbanTerror/q3ut4 .
+    rm -r UrbanTerror UrbanTerror_41_FULL.zip
     popd > /dev/null
   fi
   if [ "$STATUS" != "0" ]; then