SPECS: quake2forge.spec - added ac, fix patches to fix compilation ...

qboosh qboosh at pld-linux.org
Sat Apr 28 14:03:29 CEST 2007


Author: qboosh                       Date: Sat Apr 28 12:03:29 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added ac,fix patches to fix compilation
- removed obsolete ltdl stuff

---- Files affected:
SPECS:
   quake2forge.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/quake2forge.spec
diff -u SPECS/quake2forge.spec:1.73 SPECS/quake2forge.spec:1.74
--- SPECS/quake2forge.spec:1.73	Sat Apr 28 13:16:27 2007
+++ SPECS/quake2forge.spec	Sat Apr 28 14:03:24 2007
@@ -22,19 +22,18 @@
 Source7:	q2ded.screenrc
 Patch0:		%{name}-stupid_nvidia_bug.patch
 Patch1:		%{name}-gl.patch
+Patch2:		%{name}-ac.patch
+Patch3:		%{name}-fix.patch
 URL:		http://www.quakeforge.net/
-BuildRequires:	OpenGL-devel
+BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	SDL-devel
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	libao-devel >= 0.8.5
-BuildRequires:	libltdl-devel
 BuildRequires:	libtool
 BuildRequires:	rpmbuild(macros) >= 1.268
-BuildRequires:	sed >= 4.0
 BuildRequires:	svgalib-devel
 BuildRequires:	unzip
-#BuildRequires:	xorg-lib-libSM-devel ?
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXxf86dga-devel
@@ -48,6 +47,9 @@
 %define		_gamedatadir	%{_datadir}/games/quake2
 %define		_gamehomedir	/var/games/quake2
 
+# because of gl_image.c:1559
+%define		specflags	-fno-strict-aliasing
+
 %description
 Quake2Forge - improved version of id Software's classic Quake II
 engine.
@@ -233,24 +235,21 @@
 %setup -q -n quake2-%{version}
 %patch0
 %patch1 -p1
-
-%{__sed} -i -e 's/libltdl//' Makefile.am
-%{__sed} -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.in
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
 %{__autoheader}
-%{__libtoolize} --ltdl --automake
+%{__libtoolize}
 %{__automake}
 %{__autoconf}
 
 %configure \
 	--disable-static \
-	--enable-ltdl-install=no \
 	--libdir=%{_libdir}/games \
 	--datadir=%{_datadir}/games \
-	--enable-sdlsound \
-	--with-opengl
+	--enable-sdlsound
 
 %{__make}
 
@@ -394,6 +393,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2007/04/28 12:03:24  qboosh
+- added ac,fix patches to fix compilation
+- removed obsolete ltdl stuff
+
 Revision 1.73  2007/04/28 11:16:27  qboosh
 - desc update
 
================================================================

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



More information about the pld-cvs-commit mailing list