rpms/quake3/F-8 quake3.desktop,1.1,1.2 quake3.spec,1.1,1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12891

Modified Files:
	quake3.desktop quake3.spec 
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.desktop
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-8/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 18:57:06 -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/F-8/quake3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3.spec	29 Sep 2007 08:04:58 -0000	1.1
+++ quake3.spec	23 Dec 2007 18:57:06 -0000	1.2
@@ -2,8 +2,8 @@
 
 Name:           quake3
 Version:        1.34
-Release:        0.3.%{prever}%{?dist}
-Summary:        Quake 3 Arena tournament 3D shooter game
+Release:        0.6.%{prever}%{?dist}
+Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ioquake3.org/
@@ -21,6 +21,16 @@
 Source2:        %{name}.autodlrc
 Source3:        %{name}.desktop
 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
@@ -28,14 +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 the pak?.pk3 files
-from the original 1.32 Quake 3 Arena point release as well as pak0.pk3 from the
-original CD-ROM to /usr/share/quake3/baseq3 or ~/.q3a/baseq3.
+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
+(700 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
+(600 MB!) the first time you start World of Padman.
 
 
 %prep
@@ -67,27 +155,72 @@
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/quake3-demo
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+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
+%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 -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 || :
@@ -98,14 +231,50 @@
 %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.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
+  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.
+
 * Thu Sep 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.34-0.3.rc4
 - Update autodlrc file to use fast mirrors instead of the slow and unreliable
   official ID software site