SPECS: doomlegacy.spec - updated Makefile patch, switched to modul...

[qboosh]

Author: qboosh                       Date: Mon Oct 23 14:57:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated Makefile patch, switched to modular xorg
- added c patch (lvalue fixes needed for gcc 4)
- release 2

---- Files affected:
SPECS:
   doomlegacy.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/doomlegacy.spec
diff -u SPECS/doomlegacy.spec:1.35 SPECS/doomlegacy.spec:1.36
--- SPECS/doomlegacy.spec:1.35	Sat Jan 21 01:01:16 2006
+++ SPECS/doomlegacy.spec	Mon Oct 23 16:57:42 2006
@@ -3,7 +3,7 @@
 Summary(pl):	DOOM Legacy dla Linuksa
 Name:		doomlegacy
 Version:	1.42
-Release:	1
+Release:	2
 License:	GPL, perhaps except for doom3.wad
 Group:		Applications/Games
 Source0:	http://dl.sourceforge.net/doomlegacy/legacy_142_src.tar.gz
@@ -15,7 +15,6 @@
 Source4:	%{name}-x11.desktop
 Source5:	%{name}-sdl.desktop
 Source6:	%{name}.png
-URL:		http://legacy.newdoom.com/
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-Makefile.patch
 Patch2:		%{name}-nosndstat.patch
@@ -23,11 +22,13 @@
 Patch4:		%{name}-errno.patch
 Patch5:		%{name}-nocmap.patch
 Patch6:		%{name}-vidmodes.patch
-BuildRequires:	OpenGL-devel
+Patch7:		%{name}-c.patch
+URL:		http://legacy.newdoom.com/
+BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	SDL_mixer-devel
-BuildRequires:	XFree86-devel
 BuildRequires:	nasm
 BuildRequires:	unzip
+BuildRequires:	xorg-lib-libXext-devel
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,8 +56,7 @@
 Summary:	DOOM Legacy for Linux - X Window and OpenGL version
 Summary(pl):	DOOM Legacy dla Linuksa - wersja korzystająca z X Window i OpenGL
 Group:		X11/Applications/Games
-Requires:	OpenGL
-Obsoletes:	%{name}-x11
+Obsoletes:	doomlegacy-x11
 
 %description X11
 This is DOOM Legacy for Linux - X11 and OpenGL version.
@@ -69,7 +69,6 @@
 Summary:	DOOM Legacy for Linux - SDL version
 Summary(pl):	DOOM Legacy dla Linuksa - wersja korzystająca z SDL
 Group:		X11/Applications/Games
-Requires:	OpenGL
 
 %description sdl
 This is DOOM Legacy for Linux - SDL version.
@@ -80,24 +79,34 @@
 %prep
 %setup -q -c -a1
 %patch0 -p0
-%patch1 -p0
+%patch1 -p1
 %patch2 -p0
 %patch3 -p0
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 mkdir bin
 
 # linux_x contains some precompiled binary objects (incompatible with glibc 2.3) - kill them
-%{__make} -C doomlegacy_142_src clean LINUX=1
+%{__make} -C doomlegacy_142_src clean \
+	LINUX=1
 %{__make} -C doomlegacy_142_src \
-	PGCC=1 LINUX=1 OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
+	PGCC=1 \
+	LINUX=1 \
+	CC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
 
-%{__make} -C doomlegacy_142_src clean LINUX=1
+%{__make} -C doomlegacy_142_src clean \
+	LINUX=1
 %{__make} -C doomlegacy_142_src \
-	PGCC=1 LINUX=1 SDL=1 OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
+	PGCC=1 \
+	LINUX=1 \
+	SDL=1 \
+	CC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -110,7 +119,6 @@
 install doomlegacy_142_src/linux_x/musserv/linux/musserver $RPM_BUILD_ROOT%{_libdir}/doomlegacy
 install bin/r_opengl.so	$RPM_BUILD_ROOT%{_libdir}/doomlegacy
 
-
 install doom3.wad	$RPM_BUILD_ROOT%{_datadir}/doomlegacy
 install %{SOURCE2}	$RPM_BUILD_ROOT%{_datadir}/doomlegacy
 
@@ -154,6 +162,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/10/23 14:57:42  qboosh
+- updated Makefile patch, switched to modular xorg
+- added c patch (lvalue fixes needed for gcc 4)
+- release 2
+
 Revision 1.35  2006/01/21 00:01:16  arekm
 - kill Icon: field (support for these is obsolete says jbj)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/doomlegacy.spec?r1=1.35&r2=1.36&f=u