rpms/quake3/devel urbanterror.autodlrc, NONE, 1.1 urbanterror.desktop, NONE, 1.1 urbanterror.png, NONE, 1.1 urbanterror.sh, NONE, 1.1 wop.png, NONE, 1.1 worldofpadman.autodlrc, NONE, 1.1 worldofpadman.desktop, NONE, 1.1 worldofpadman.sh, NONE, 1.1 quake3.desktop, 1.1, 1.2 quake3.spec, 1.2, 1.3

Sun Dec 23 14:40:44 UTC 2007

Author: jwrdegoede

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

Modified Files:
	quake3.desktop quake3.spec 
Added Files:
	urbanterror.autodlrc urbanterror.desktop urbanterror.png 
	urbanterror.sh wop.png worldofpadman.autodlrc 
	worldofpadman.desktop worldofpadman.sh 
Log Message:
* 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
  get the demo launcher installed
- Add installer / launcher for Urban Terror in an urbanterror subpackage
  (bz 385771)
- Add installer / launcher for World of Padman in a worldofpadman subpackage

--- NEW FILE urbanterror.autodlrc ---
[MESSAGELIST]
[MESSAGE]
	[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.
[/TEXT]
[/MESSAGE]
[MESSAGE]
	[TITLE]License Information[/TITLE]
	[TEXT]Urban Terror is distributed free over the Internet and is covered by the Quake 3SDK licence agreement [EULA]. The mod files may not be sold [in any form] or distributed on physical media unless with permission from iD Software.

For further information on legal use of programs derived from Quake 3 source code, please contact their respective authors.[/TEXT]
[/MESSAGE]
[/MESSAGELIST]

[FILELIST]
[FILE]
	[FILENAME]UrbanTerror40_full.zip[/FILENAME]
	[MD5]4aec86405b548b041686f92eb584cbf9[/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]
	[/MIRRORS]
[/FILE]
[/FILELIST]


--- NEW FILE urbanterror.desktop ---
[Desktop Entry]
Name=Urban Terror
Comment=Urban Terror launcher, will automatically download the needed data-files
Exec=urbanterror
Icon=urbanterror
Terminal=false
Type=Application
Categories=Game;ActionGame;


--- NEW FILE urbanterror.sh ---
#!/bin/bash

set -e

. /usr/share/opengl-games-utils/opengl-game-functions.sh

checkDriOK "Urban Terror"

if [ ! -f ~/.q3a/q3ut4/zpak000.pk3 ]; then
  set +e
  /usr/share/autodl/AutoDL.py /usr/share/quake3/urbanterror.autodlrc
  STATUS=$?
  set -e
  # 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
    popd > /dev/null
  fi
  if [ "$STATUS" != "0" ]; then
    exit $STATUS
  fi
fi

exec quake3 +set fs_game q3ut4 "$@"


--- NEW FILE worldofpadman.autodlrc ---
[MESSAGELIST]
[MESSAGE]
	[TITLE]Please click 'Accept' to allow internet access.[/TITLE]
	[TEXT]In order to play the World of Padman, the datafiles are needed. World of Padman is a mod/total conversion based on the Quake 3 engine.

Click Accept, to download the The World of Padman datafiles, which can be freely downloaded from the internet.
[/TEXT]
[/MESSAGE]
[MESSAGE]
	[TITLE]License Information[/TITLE]
	[TEXT]The World of Padman is protected by copyright. 
 The copyrights belong to the respective authors of the WoP-Team. All commercial use of the World of Padman and consequently the single works is prohibited unless you have explicit permission from the WoP-Team.
 This includes, but is not limited to, mass archival as on a cd-rom and inclusion in commercially published compilations (books and/or magazines). 
 This includes further the prohibition of copying, changing, mirroring and public reproduction in sense of a commercial use electronic or otherwise. Private non-commercial copying, mirroring and even public reproduction is desired. ;-) 
 Changes to the game and consequently the single works whether commercial or not, is prohibited without explicit permission. 
 Some parts of the game were created with material, (e.g. textures, Sounds) which we acquired from different sources; they are free of any of third party rights as far as we know. If anyone discovers we've used his / her work unlawfully, contact us immediately so that we can respond as soon as possible. 
 The source code will be released under the GPL! For more information about the GPL see gpl.txt. 
 If you have any questions contact the WoP-Team by E-Mail:
 ente at worldofpadman.com or team at worldofpadman.com[/TEXT]
[/MESSAGE]
[/MESSAGELIST]

[FILELIST]
[FILE]
	[FILENAME]worldofpadman.run[/FILENAME]
	[MD5]c7650414d7865ddac26ada6b3f7b8cc9[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/worldofpadman.run[/URL]
		[URL]http://thilo.kickchat.com/download/worldofpadman.run[/URL]
		[URL]http://btc3x6.che.uni-bayreuth.de/~tl/wop_final/worldofpadman.run[/URL]
		[URL]http://www.extreme-players.de/download.php?id=12217[/URL]
		[URL]http://download.cfs.game-host.org/get.php?get=/pub/games/wop/worldofpadman.run[/URL]
	[/MIRRORS]
[/FILE]
[FILE]
	[FILENAME]wop_patch_1_2.run[/FILENAME]
	[MD5]3468FC91889795471BC68E35EA334614[/MD5]
	[PATH]$HOME/.q3a[/PATH]
	[MIRRORS]
		[URL]ftp://ftp.kickchat.com/wop/wop_patch_1_2.run[/URL]
		[URL]ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/wop_patch_1_2.run[/URL]
		[URL]http://www.hessenfragger.de/uploads/wop_patch_1_2.run[/URL]
	[/MIRRORS]
[/FILE]
[/FILELIST]


--- NEW FILE worldofpadman.desktop ---
[Desktop Entry]
Name=World of Padman
Comment=World of Padman launcher, will automatically download the needed data-files
Exec=worldofpadman
Icon=wop
Terminal=false
Type=Application
Categories=Game;ActionGame;


--- NEW FILE worldofpadman.sh ---
#!/bin/bash

set -e

if [ ! -f $HOME/.q3a/wop/wop_006.pk3 ]; then
	set +e
	/usr/share/autodl/AutoDL.py /usr/share/quake3/worldofpadman.autodlrc
	STATUS=$?
	set -e

	# status 2 means download was ok, but the user choice not to start the game
	if [ "$STATUS" = "0" -o "$STATUS" = "2" ]; then
		mkdir -p $HOME/.q3a/wop/extras
		pushd $HOME/.q3a/wop > /dev/null
		
		# install wop 1.1
		sh ../worldofpadman.run --nox11 --noexec --target .
		tar xf readme.tar
		tar xf extras.tar -C extras wop_dvd_cover*
		tar xf wop-data.tar
		rm -r bin setup.sh setup.data *.tar ../worldofpadman.run

		# install 1.2 patch
		sh ../wop_patch_1_2.run --nox11 --noexec --target .
		tar xf extras.tar
		tar xf wop-data-1.2.tar
		rm -r bin setup.sh setup.data *.tar ../wop_patch_1_2.run
		
		popd > /dev/null
	fi
	if [ "$STATUS" != "0" ]; then
		exit $STATUS
	fi
fi

exec quake3 +set fs_game wop "$@"


Index: quake3.desktop
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3.desktop	29 Sep 2007 08:04:58 -0000	1.1
+++ quake3.desktop	23 Dec 2007 14:40:07 -0000	1.2
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Quake 3 Arena
 Comment=Quake 3 Arena demo launcher, will automatically download the needed data-files
 Exec=quake3-demo


Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quake3.spec	13 Dec 2007 12:24:27 -0000	1.2
+++ quake3.spec	23 Dec 2007 14:40:07 -0000	1.3
@@ -2,8 +2,8 @@
 
 Name:           quake3
 Version:        1.34
-Release:        0.4.%{prever}%{?dist}
-Summary:        Quake 3 Arena tournament 3D shooter game
+Release:        0.5.%{prever}%{?dist}
+Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ioquake3.org/
@@ -23,6 +23,14 @@
 Source4:        %{name}.png
 Source5:        %{name}-update.sh
 Source6:        %{name}-update.autodlrc
+Source7:        urbanterror.sh
+Source8:        urbanterror.autodlrc
+Source9:        urbanterror.desktop
+Source10:       urbanterror.png
+Source11:       worldofpadman.sh
+Source12:       worldofpadman.autodlrc
+Source13:       worldofpadman.desktop
+Source14:       wop.png
 Patch0:         %{name}-1.34-syslibs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel
@@ -30,17 +38,92 @@
 %ifarch %{ix86} x86_64
 BuildRequires:  nasm
 %endif
-Requires:       hicolor-icon-theme autodownloader opengl-games-utils unzip
+# for quake3-update
+Requires:       autodownloader tar
 
 %description
-This package contains the Quake 3 Arena engine. It comes with an applications
-menu entry, which will offer to download and install the Quake 3 demo datafiles
-for you.
-
-If you own a copy of quake 3, you will need to copy pak0.pk3 from the original
-CD-ROM and your q3key to /usr/share/quake3/baseq3 or ~/.q3a/baseq3.
-Also copy the pak?.pk3 files from the original 1.32 Quake 3 Arena point release
-there if you have them available or run quake3-update to download them for you.
+This package contains the enhanced opensource ioquake3 version of the Quake 3
+Arena engine. This engine can be used to play a number of games based on this
+engine, below is an (incomplete list):
+
+* OpenArena Free, Open Source Quake3 like game, recommended!
+  (packagename: openarena)
+
+* Urban Terror, gratis, but not Open Source FPS best be described as a
+  Hollywood tactical shooter, a downloader and installer including an
+  application menu entry is available in the urbanterror package.
+
+* World of Padman, gratis, but not Open Source Comic FPS, a downloader and
+  installer including an application menu entry is available in the
+  worldofpadman package.
+
+* Quake3 Arena, the original! A downloader and installer for the gratis, but
+  not Open Source demo, including an application menu entry is available in
+  the quake3-demo package.
+  
+  If you own a copy of quake 3, you will need to copy pak0.pk3 from the
+  original CD-ROM and your q3key to /usr/share/quake3/baseq3 or ~/.q3a/baseq3.
+  Also copy the pak?.pk3 files from the original 1.32 Quake 3 Arena point
+  release there if you have them available or run quake3-update to download
+  them for you.
+
+
+%package demo
+Summary:        Quake 3 Arena tournament 3D shooter game demo installer
+Group:          Amusements/Games
+Requires:       quake3 hicolor-icon-theme opengl-games-utils unzip
+# quake3-demo used to be part of the quake3 package, make sure that people
+# who have the old version with the demo included don't all of a sudden have
+# the demo menu entry disappear.
+Obsoletes:      quake3 <= 1.34-0.4.rc4.fc9
+
+%description demo
+Quake 3 Arena tournament 3D shooter game demo installer. The Quake3 engine is
+Open Source and as such is available as part of Fedora. The original Quake3
+datafiles however are not Open Source and thus are not available as part of
+Fedora. There is a gratis, but not Open Source demo available on the internet.
+
+This package installs an applications menu entry for playing the Quake3 Arena
+demo. The first time you click this menu entry, it will offer to download and
+install the Quake 3 demo datafiles for you.
+
+
+%package -n urbanterror
+Summary:        FPS best be described as a Hollywood tactical shooter
+Group:          Amusements/Games
+URL:            http://www.urbanterror.net/
+Requires:       quake3 hicolor-icon-theme opengl-games-utils unzip
+
+%description -n urbanterror
+Urban Terror could best be described as a Hollywood tactical shooter; it is
+realism based to a certain extent (environments/weapons/player models), but
+also goes by the motto "fun over realism" (fast gameplay and lots of action).
+This combination of reality and action results in a very unique, enjoyable
+and addictive game.
+
+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.
+
+
+%package -n worldofpadman
+Summary:        World Of Padman - Comic 3D-Shooter
+Group:          Amusements/Games
+URL:            http://padworld.myexp.de/
+Requires:       quake3 hicolor-icon-theme opengl-games-utils tar gzip
+
+%description -n worldofpadman
+World of Padman (WoP) is a first-person shooter computer game available in
+both English and German. The idea is based on the Padman comic strip for the
+magazine PlayStation Games created by the professional cartoon artist Andreas
+'ENTE' Endres, who is also the man who made many of the maps included with the
+game in 1998. Most of the maps in the game are lilliput style.
+
+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.
 
 
 %prep
@@ -75,27 +158,69 @@
 install -p -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/quake3-update
 install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+install -p -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/urbanterror
+install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+install -p -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_bindir}/worldofpadman
+install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/%{name}
+
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE3}
+desktop-file-install --vendor fedora            \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %{SOURCE9}
+desktop-file-install --vendor fedora            \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %{SOURCE13}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
 install -p -m 644 %{SOURCE4} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
+install -p -m 644 %{SOURCE10} \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+install -p -m 644 %{SOURCE14} \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
+%post demo
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun demo
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%post -n urbanterror
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun -n urbanterror
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%post -n worldofpadman
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%postun
+%postun -n worldofpadman
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -106,14 +231,44 @@
 %defattr(-,root,root,-)
 %doc BUGS ChangeLog COPYING.txt id-readme.txt md4-readme.txt NOTTODO README
 %doc TODO code/jpeg-6/README
-%{_bindir}/%{name}*
+%{_bindir}/%{name}
+%{_bindir}/%{name}-smp
+%{_bindir}/%{name}-update
 %{_bindir}/q3ded
-%{_datadir}/%{name}
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/%{name}-update.autodlrc
+
+%files demo
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-demo
+%{_datadir}/%{name}/%{name}.autodlrc
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
+%files -n urbanterror
+%defattr(-,root,root,-)
+%{_bindir}/urbanterror
+%{_datadir}/%{name}/urbanterror.autodlrc
+%{_datadir}/applications/fedora-urbanterror.desktop
+%{_datadir}/icons/hicolor/128x128/apps/urbanterror.png
+
+%files -n worldofpadman
+%defattr(-,root,root,-)
+%{_bindir}/worldofpadman
+%{_datadir}/%{name}/worldofpadman.autodlrc
+%{_datadir}/applications/fedora-worldofpadman.desktop
+%{_datadir}/icons/hicolor/32x32/apps/wop.png
+
 
 %changelog
+* 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
+  get the demo launcher installed
+- Add installer / launcher for Urban Terror in an urbanterror subpackage
+  (bz 385771)
+- Add installer / launcher for World of Padman in a worldofpadman subpackage
+
 * Wed Dec 12 2007 Alexey Kuznetsov <kuznetsov.alexey at gmail.com> 1.34-0.4.rc4
 - Add quake3-update srcipt.
 


