rpms/openarena/FC-6 openarena.spec,1.2,1.3 sources,1.2,1.3
Jon Ciesla (limb)
fedora-extras-commits at redhat.com
Thu Aug 16 15:18:01 UTC 2007
Author: limb
Update of /cvs/pkgs/rpms/openarena/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17641
Modified Files:
openarena.spec sources
Log Message:
Bump to 0.7.1.
Index: openarena.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openarena/FC-6/openarena.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openarena.spec 12 Jan 2007 18:21:32 -0000 1.2
+++ openarena.spec 16 Aug 2007 15:17:29 -0000 1.3
@@ -1,18 +1,21 @@
%define ver %(echo %version | tr -d .)
Name: openarena
-Version: 0.6.0
-Release: 4%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
Summary: Open source first person shooter
Group: Amusements/Games
License: GPL
URL: http://openarena.ws/
-Source0: http://openarena.ws/rel/%{ver}/oa%{ver}.tar.gz
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-data = %{version}
BuildRequires: ImageMagick
-BuildRequires: SDL-devel openal-devel curl-devel
+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
@@ -28,7 +31,7 @@
This package contains data files essential to play OpenArena.
%prep
-%setup -q -c
+%setup -qn openarena-0.7.0
#1. let us create wrapper for openarena and for openarena_ded
# we can use one wrapper to that task
cat > %{name} << EOF
@@ -48,18 +51,15 @@
EOF
chmod +x %{name}
ln -s %{name} %{name}_ded
-#2. unpack the sources
-cd source
-tar xfj ioq3sources.tar.bz2
-cd ..
-IOQ3=$(ls -d source/ioq3-*)
+#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
# permissions to make a %files section easier ;-)
-mkdir -p doc/ioq3
-cp -p $IOQ3/{BUGS,ChangeLog,NOTTODO,README,TODO,id-readme.txt,md4-readme.txt} doc/ioq3
+mkdir doc
cp -p CHANGES COPYING CREDITS README doc
-chmod -x doc/{COPYING,CREDITS,CHANGES}
+chmod -x doc/*
#4. fix end-of-line encodings
for file in doc/{COPYING,CREDITS,CHANGES,README}; do
@@ -69,44 +69,44 @@
#5. 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
+%ifarch ppc ppc64
FLAGS="$FLAGS -DNO_VM_COMPILED"
%endif
-make distclean -C source/ioq3-*
-make build_debug DEBUG_CFLAGS="%{optflags} $FLAGS" -C source/ioq3-*
+make distclean
+make build_debug DEBUG_CFLAGS="%{optflags} $FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-IOQ3=$(ls -d source/ioq3-*)/build/debug-linux-%{_arch}
+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
-# there's a lot of files we don't need
-# all of them have 644 permissions
-# so find them and delete them
-
-find $IOQ3 -perm 644 -type f | xargs rm -rf
-
-# removing files leaves a few empty directories
-# we can remove them as well
-
-find $IOQ3 -type d -empty | xargs rm -rf
-
-# smp binary is also unneeded
+# there's a few dirs and files we don't need
+# get them deleted!
-rm -rf $IOQ3/*smp*
+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 %{name} %{name}_ded $RPM_BUILD_ROOT%{_bindir}
cp -p %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -133,6 +133,19 @@
%{_datadir}/%{name}
%changelog
+* Mon Aug 13 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.1-1
+- Added 0.7.1 patch.
+- Uses 0.7.0 .zip, took version macro out of URL and setup to accommodate.
+
+* Fri Jul 13 2007 MichaÅ Bentkowski <mr.ecik at gmail.com> - 0.7.0-3
+- NO_VM_COMPILED flag on ppc64
+
+* Fri Jul 13 2007 MichaÅ Bentkowski <mr.ecik at gmail.com> - 0.7.0-2
+- Add libvorbis-devel BR
+
+* Wed Jul 11 2007 MichaÅ Bentkowski <mr.ecik at gmail.com> - 0.7.0-1
+- Update to 0.7.0
+
* Fri Jan 12 2007 MichaÅ Bentkowski <mr.ecik at gmail.com> - 0.6.0-4
- Get rid of -maltivec flag
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openarena/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Jan 2007 21:53:57 -0000 1.2
+++ sources 16 Aug 2007 15:17:29 -0000 1.3
@@ -1 +1,3 @@
-0c2c27456a11331d61448278a1e9aaad oa060.tar.gz
+a43cd6044de919dd2af94fb4159ddb47 ioq3-src-oa.tar.bz2
+739548bfc5dc1d129d20c0f67d54df48 oa070.zip
+5fa31998009f8241ad3ded93eb81e701 oa071-patch.zip
More information about the scm-commits
mailing list