rpms/openarena/devel .cvsignore, 1.4, 1.5 openarena.spec, 1.9, 1.10 sources, 1.4, 1.5 menudef.h, 1.1, NONE

Michał Bentkowski (ecik) fedora-extras-commits at redhat.com
Sun Jan 6 12:36:15 UTC 2008 

Author: ecik

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

Modified Files:
	.cvsignore openarena.spec sources 
Removed Files:
	menudef.h 
Log Message:
* Sat Jan 05 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.7.1-4
- Use quake3 package from repo instead of own engine
- No -data subpackage since the main package now contains data
- Now the spec simple creates wrapper and just copy data to proper dir



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openarena/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Aug 2007 16:14:20 -0000	1.4
+++ .cvsignore	6 Jan 2008 12:35:38 -0000	1.5
@@ -1,3 +1,2 @@
-ioq3-src-oa.tar.bz2
 oa070.zip
 oa071-patch.zip


Index: openarena.spec
===================================================================
RCS file: /cvs/extras/rpms/openarena/devel/openarena.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openarena.spec	5 Oct 2007 14:34:14 -0000	1.9
+++ openarena.spec	6 Jan 2008 12:35:38 -0000	1.10
@@ -1,38 +1,32 @@
 %define         ver %(echo %version | tr -d .)
 Name:           openarena
 Version:        0.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Open source first person shooter
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://openarena.ws/
 Source0:        http://download.tuxfamily.net/cooker/openarena/rel070/oa070.zip
 Source1:        http://cheapy.deathmask.net/logo.gif
-Source2:        http://www.openarena.ws/svn/source/ui/menudef.h
-Source3:        openarena.desktop
-Source4:	oa071-patch.zip
-Source99:       http://openarena.ws/rel/%{ver}/ioq3-src-oa.tar.bz2
+Source2:        openarena.desktop
+Source3:        oa071-patch.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       %{name}-data = %{version}
+Requires:       quake3
 Requires:       opengl-games-utils
 BuildRequires:  ImageMagick
 BuildRequires:  SDL-devel openal-devel curl-devel libvorbis-devel
 BuildRequires:  desktop-file-utils
-%description
-OpenArena is an open-source content package for Quake III Arena licensed under
-the GPL, effectively creating a free stand-alone game.
+Provides:       openarena-data = %{version}-%{release}
+Obsoletes:      openarena-data < 0.7.1-4
+BuildArch:      noarch
 
-%package data
-Group:          Amusements/Games
-Summary:        Data files for %{name}
-Requires:       %{name}
-%description data
+%description
 OpenArena is an open-source content package for Quake III Arena licensed under
 the GPL, effectively creating a free stand-alone game.
-This package contains data files essential to play OpenArena.
 
 %prep
-%setup -qn openarena-0.7.0
+%setup -q -n openarena-0.7.0
+%setup -q -c -T -D -b 3 -n openarena-0.7.0 #unpack patch in the same directory where data
 #1. let us create wrapper for openarena and for openarena_ded
 #   we can use one wrapper to that task
 cat > %{name} << EOF
@@ -50,76 +44,48 @@
     || ln -s \$DATA_DIR/\$file \$BASEOA_HOME_DIR/\$file
 done
 if [[ "\$0" =~ "ded" ]]; then
-    exec %{_libexecdir}/%{name}/ioq3ded.%{_arch} "\$@"
+    exec %{_bindir}/quake3 +set dedicated 1 +set fs_game baseoa +set fs_homepath \$HOME/.openarena "\$@"
 else
-    exec %{_libexecdir}/%{name}/ioquake3.%{_arch} "\$@"
+    exec %{_bindir}/quake3 +set fs_game baseoa +set fs_homepath \$HOME/.openarena "\$@"
 fi
 EOF
 chmod +x %{name}
 ln -s %{name} %{name}_ded
-#2. set the sources
-%setup -q -c -T -D -b 99 -n openarena-0.7.0 #unpack sources in the same directory where data
-%setup -q -c -T -D -b 4 -n openarena-0.7.0 #unpack patch in the same directory where data
 
-#3. copy all documentation to one directory and get rid of unexpected
+#2. copy all documentation to one directory and get rid of unexpected
 #   permissions to make a %files section easier ;-)
 mkdir doc
 cp -p CHANGES COPYING CREDITS README doc
 chmod -x doc/*
 
-#4. fix end-of-line encodings
+#3. fix end-of-line encodings
 for file in doc/{COPYING,CREDITS,CHANGES,README}; do
     sed s/\\r// -i $file
 done
 
-#5. convert a .gif file to .png format
+#4. convert a .gif file to .png format
 convert %{SOURCE1} %{name}.png
 
-#6. make this thing compilable
-mkdir ui
-cp -p %{SOURCE2} ui
-
 %build
-FLAGS="-fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-       -DUSE_OPENAL=1 -DUSE_CURL=1 -DUSE_CURL_DLOPEN=1 \
-       -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(sdl-config --cflags) \
-       -DUSE_LOCAL_HEADERS=1"
-%ifarch ppc ppc64
-FLAGS="$FLAGS -DNO_VM_COMPILED"
-%endif
-make distclean
-make build_debug DEBUG_CFLAGS="%{optflags} $FLAGS"
+echo We build nothing
 
 %install
 rm -rf $RPM_BUILD_ROOT
-IOQ3="build/debug-linux-%{_arch}"
-# there's no option to install unstripped binary files so we have to do it manually
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir $RPM_BUILD_ROOT%{_bindir}
 
-# there's a few dirs and files we don't need
-# get them deleted!
-
-rm -rf $IOQ3/{baseq3,client,ded,missionpack}
-rm -f $IOQ3/*smp*
-
-# the things we have done above make it easier to install the application
-
-
-cp -rp $IOQ3/* $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-#ugly hack for 0.7.1 patch, sorry, please clean.
-mv openarena-0.7.0/baseoa/* baseoa
-rmdir openarena-0.7.0/baseoa
-mv openarena-0.7.0/* .
 cp -p baseoa/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -p openarena-0.7.0/baseoa/pak7-patch.pk3 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -p %{name} %{name}_ded $RPM_BUILD_ROOT%{_bindir}
 cp -p %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
+chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}/*
+
 desktop-file-install --vendor="fedora"                        \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications         \
-        %{SOURCE3}
+        %{SOURCE2}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -129,16 +95,17 @@
 %defattr(-,root,root,-)
 %doc doc/*
 %{_bindir}/%{name}*
-%{_libexecdir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/fedora-*
 %{_datadir}/pixmaps/%{name}.png
 
-%files data
-%defattr(-,root,root,-)
-%doc doc/COPYING
-%{_datadir}/%{name}
 
 %changelog
+* Sat Jan 05 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.7.1-4
+- Use quake3 package from repo instead of own engine
+- No -data subpackage since the main package now contains data
+- Now the spec simple creates wrapper and just copy data to proper dir
+
 * Fri Oct 05 2007 Michał Bentkowski <mr.ecik at gmail.com> - 0.7.1-3
 - Add support for opengl-games-utils
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openarena/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Aug 2007 16:14:20 -0000	1.4
+++ sources	6 Jan 2008 12:35:38 -0000	1.5
@@ -1,3 +1,2 @@
-a43cd6044de919dd2af94fb4159ddb47  ioq3-src-oa.tar.bz2
 739548bfc5dc1d129d20c0f67d54df48  oa070.zip
 5fa31998009f8241ad3ded93eb81e701  oa071-patch.zip


--- menudef.h DELETED ---

More information about the fedora-extras-commits mailing list