From: ankry <ankry@pld-linux.org>
Date: Fri, 7 Mar 2003 00:23:31 +0000 (+0000)
Subject: - merge with HEAD: version 1.40, rel. 2
X-Git-Tag: doomlegacy-1_40-3~3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=025a4bd49f0bdac0779673142119ce690e7a44df;p=packages%2Fdoomlegacy.git

- merge with HEAD: version 1.40, rel. 2

Changed files:
    doomlegacy.spec -> 1.9.2.1
---

diff --git a/doomlegacy.spec b/doomlegacy.spec
index 9bdfdc6..16e64f0 100644
--- a/doomlegacy.spec
+++ b/doomlegacy.spec
@@ -1,18 +1,21 @@
 Summary:	DOOM Legacy for Linux
 Summary(pl):	DOOM Legacy dla Linuksa
 Name:		doomlegacy
-Version:	1.32
-Release:	1.beta1.1
+Version:	1.40
+Release:	2
 License:	GPL, perhaps except for doom3.wad
 Group:		Applications/Games
-Source0:	http://prdownloads.sourceforge.net/doomlegacy/legacy_132beta1_src.tar.gz
-Source1:	http://prdownloads.sourceforge.net/doomlegacy/doom3_wad_132.zip
+Source0:	http://dl.sourceforge.net/doomlegacy/legacy_140_src.tar.gz
+Source1:	http://dl.sourceforge.net/doomlegacy/doom3_wad_132.zip
+Source2:	http://dl.sourceforge.net/doomlegacy/legacy_dat.zip
+URL:		http://legacy.newdoom.com/
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-Makefile.patch
 Patch2:		%{name}-nosndstat.patch
-BuildRequires:	XFree86-devel
+Patch3:		%{name}-sound.patch
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL_mixer-devel
+BuildRequires:	XFree86-devel
 BuildRequires:	nasm
 BuildRequires:	unzip
 ExclusiveArch:	%{ix86}
@@ -65,16 +68,23 @@ This is DOOM Legacy for Linux - SDL version.
 To jest DOOM Legacy dla Linuksa - wersja SDL.
 
 %prep
-%setup -q -c -a 1
-%patch0 -p1
+%setup -q -c -a 1 -a 2
+%patch0 -p0
 %patch1 -p0
-%patch2 -p1
+%patch2 -p0
+%patch3 -p0
 
 %build
-install -d doomlegacy/linux_x/{musserv,sndserv}/{objs,bin}
-%{__make} -C doomlegacy PGCC=1 LINUX=1 OPTFLAGS="%{rpmcflags}"
-%{__make} -C doomlegacy clean LINUX=1
-%{__make} -C doomlegacy PGCC=1 LINUX=1 SDL=1 OPTFLAGS="%{rpmcflags}"
+mkdir bin
+
+# linux_x contains some precompiled binary objects (incompatible with glibc 2.3) - kill them
+%{__make} -C doomlegacy_src clean LINUX=1
+%{__make} -C doomlegacy_src \
+	PGCC=1 LINUX=1 OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
+
+%{__make} -C doomlegacy_src clean LINUX=1
+%{__make} -C doomlegacy_src \
+	PGCC=1 LINUX=1 SDL=1 OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,18 +92,19 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/doomlegacy,%{_datadir}/doomlega
 
 install bin/llxdoom	$RPM_BUILD_ROOT%{_bindir}
 install bin/lsdldoom	$RPM_BUILD_ROOT%{_bindir}
-install doomlegacy/linux_x/sndserv/linux/llsndserv $RPM_BUILD_ROOT%{_libdir}/doomlegacy
-install doomlegacy/linux_x/musserv/linux/musserver $RPM_BUILD_ROOT%{_libdir}/doomlegacy
+install doomlegacy_src/linux_x/sndserv/linux/llsndserv $RPM_BUILD_ROOT%{_libdir}/doomlegacy
+install doomlegacy_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 legacy.dat	$RPM_BUILD_ROOT%{_datadir}/doomlegacy
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files common
 %defattr(644,root,root,755)
-%doc doomlegacy/_doc/*.txt
+%doc doomlegacy_src/_doc/*.txt
 %dir %{_libdir}/doomlegacy
 %attr(755,root,root) %{_libdir}/doomlegacy/*serv*
 %{_datadir}/doomlegacy