SPECS: quake2forge.spec - pkglibdir/pkgdatadir without "games" (as...

[qboosh]

Author: qboosh                       Date: Sat Apr 28 21:11:40 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pkglibdir/pkgdatadir without "games" (as executable exists in /usr/bin not /usr/games)
- added gamedir patch

---- Files affected:
SPECS:
   quake2forge.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/quake2forge.spec
diff -u SPECS/quake2forge.spec:1.75 SPECS/quake2forge.spec:1.76
--- SPECS/quake2forge.spec:1.75	Sat Apr 28 14:13:00 2007
+++ SPECS/quake2forge.spec	Sat Apr 28 23:11:35 2007
@@ -24,6 +24,7 @@
 Patch1:		%{name}-gl.patch
 Patch2:		%{name}-ac.patch
 Patch3:		%{name}-fix.patch
+Patch4:		%{name}-gamedir.patch
 URL:		http://www.quakeforge.net/
 BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	SDL-devel
@@ -43,8 +44,8 @@
 Obsoletes:	quake2 <= 1:0.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_gamelibdir	%{_libdir}/games/quake2
-%define		_gamedatadir	%{_datadir}/games/quake2
+%define		_gamelibdir	%{_libdir}/quake2
+%define		_gamedatadir	%{_datadir}/quake2
 %define		_gamehomedir	/var/games/quake2
 
 # because of gl_image.c:1559
@@ -237,18 +238,17 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal}
+%{__autoconf}
 %{__autoheader}
-%{__libtoolize}
 %{__automake}
-%{__autoconf}
 
 %configure \
 	--disable-static \
-	--libdir=%{_libdir}/games \
-	--datadir=%{_datadir}/games \
 	--enable-sdlsound
 
 %{__make}
@@ -263,13 +263,6 @@
 	$RPM_BUILD_ROOT{/etc/sysconfig,/etc/rc.d/init.d} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
 
-#$RPM_BUILD_ROOT%{_gamedir}/baseq2/players/{crakhor,cyborg,female,male}
-
-#for i in crakhor cyborg female male ; do
-#        install baseq2/players/$i/* $RPM_BUILD_ROOT%{_gamedir}/baseq2/players/$i
-#done
-#install baseq2/pak2.pak        $RPM_BUILD_ROOT%{_gamedir}/quake2/baseq2
-
 install %{SOURCE2} $RPM_BUILD_ROOT%{_gamehomedir}/.quake2/baseq2/server.cfg
 install %{SOURCE7} $RPM_BUILD_ROOT%{_gamehomedir}/.screenrc
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/q2ded
@@ -281,9 +274,8 @@
 cp -a docs _doc
 rm -rf _doc/{CVS,Makefile*,ctf/CVS,ctf/Makefile*}
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/games/quake2/snd_{alsa,ao,oss,sdl}.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/games/quake2/ref_{soft,softx,sdlgl,softsdl,glx}.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/games/quake2/{baseq2,ctf}/game.la
+rm -f $RPM_BUILD_ROOT%{_gamelibdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_gamelibdir}/*/game.la
 rm -f $RPM_BUILD_ROOT%{_gamedatadir}/baseq2/config.cfg
 
 %clean
@@ -349,7 +341,6 @@
 %files 3dfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_gamelibdir}/ref_tdfx.so
-%{_gamelibdir}/ref_tdfx.la
 
 %files glx
 %defattr(644,root,root,755)
@@ -393,6 +384,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2007/04/28 21:11:35  qboosh
+- pkglibdir/pkgdatadir without "games" (as executable exists in /usr/bin not /usr/games)
+- added gamedir patch
+
 Revision 1.75  2007/04/28 12:13:00  qboosh
 - files update
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/quake2forge.spec?r1=1.75&r2=1.76&f=u