Author: glen Date: Wed Jan 19 23:35:52 2011 GMT Module: packages Tag: HEAD ---- Log message: - be independant of source tarball structure, use %banner
---- Files affected: packages/doomlegacy: doomlegacy.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: packages/doomlegacy/doomlegacy.spec diff -u packages/doomlegacy/doomlegacy.spec:1.38 packages/doomlegacy/doomlegacy.spec:1.39 --- packages/doomlegacy/doomlegacy.spec:1.38 Mon Feb 12 22:23:53 2007 +++ packages/doomlegacy/doomlegacy.spec Thu Jan 20 00:35:46 2011 @@ -7,8 +7,8 @@ License: GPL, perhaps except for doom3.wad Group: Applications/Games Source0: http://dl.sourceforge.net/doomlegacy/legacy_142_src.tar.gz -# Source0-md5: 62f5cdad464463038d568a53b13c22f7 -Source1: http://dl.sourceforge.net/doomlegacy/doom3_wad_132.zip +# Source0-md5: e1cc5039872dc70e506cd427a9015080 +Source1: http://downloads.sourceforge.net/doomlegacy/doom3_wad_132.zip # Source1-md5: 3d737bb577bc4295af68d54988191344 Source2: http://ep09.pld-linux.org/~havner/legacy.dat # Source2-md5: df5cac5c3d37849ceb432cbff4df2415 @@ -23,10 +23,11 @@ Patch5: %{name}-nocmap.patch Patch6: %{name}-vidmodes.patch Patch7: %{name}-c.patch -URL: http://legacy.newdoom.com/ +URL: http://doomlegacy.sourceforge.net/ BuildRequires: OpenGL-GLU-devel BuildRequires: SDL_mixer-devel BuildRequires: nasm +BuildRequires: rpmbuild(macros) >= 1.595 BuildRequires: unzip BuildRequires: xorg-lib-libXext-devel ExclusiveArch: %{ix86} @@ -77,31 +78,51 @@ To jest DOOM Legacy dla Linuksa - wersja SDL. %prep -%setup -q -c -a1 -%patch0 -p0 -%patch1 -p1 -%patch2 -p0 -%patch3 -p0 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%setup -qc -a1 +mv doomlegacy_142_src src +cd src +%patch0 -p1 +%patch1 -p2 +%patch2 -p1 +%patch3 -p1 +%patch4 -p2 +%patch5 -p2 +%patch6 -p2 +%patch7 -p2 %build -mkdir bin +install -d objs bin +cd src # linux_x contains some precompiled binary objects (incompatible with glibc 2.3) - kill them -%{__make} -C doomlegacy_142_src clean \ +%{__make} clean \ LINUX=1 -%{__make} -C doomlegacy_142_src \ + +# build musserv/sndserv first. with our flags +%{__make} -C linux_x/musserv -f Makefile.linux \ + CC="%{__cc}" \ + OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}" + LDFLAGS="%{rpmldflags}" +install -p linux_x/musserv/linux/musserver ../bin + +%{__make} -C linux_x/sndserv \ + CC="%{__cc}" \ + OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}" + LDFLAGS="%{rpmldflags}" +install -p linux_x/sndserv/linux/llsndserv ../bin + +# build llxdoom +%{__make} \ PGCC=1 \ LINUX=1 \ CC="%{__cc}" \ OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}" -%{__make} -C doomlegacy_142_src clean \ +%{__make} clean \ LINUX=1 -%{__make} -C doomlegacy_142_src \ + +# build lsdldoom +%{__make} \ PGCC=1 \ LINUX=1 \ SDL=1 \ @@ -113,33 +134,33 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/doomlegacy,%{_datadir}/doomlegacy} \ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} -install bin/llxdoom $RPM_BUILD_ROOT%{_bindir} -install bin/lsdldoom $RPM_BUILD_ROOT%{_bindir} -install doomlegacy_142_src/linux_x/sndserv/linux/llsndserv $RPM_BUILD_ROOT%{_libdir}/doomlegacy -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 - -install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir} +install -p bin/llxdoom $RPM_BUILD_ROOT%{_bindir} +install -p bin/lsdldoom $RPM_BUILD_ROOT%{_bindir} +install -p bin/llsndserv $RPM_BUILD_ROOT%{_libdir}/doomlegacy +install -p bin/musserver $RPM_BUILD_ROOT%{_libdir}/doomlegacy +install -p bin/r_opengl.so $RPM_BUILD_ROOT%{_libdir}/doomlegacy + +cp -p doom3.wad $RPM_BUILD_ROOT%{_datadir}/doomlegacy +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/doomlegacy + +cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir} %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT %post common -if [ "$1" = "1" ]; then - echo "To run doomlegacy you need some WAD file: either freedoom package" - echo "or some shareware or commercial WAD from Doom or Heretic:" - echo "Doom.wad, Doom1.wad, Doom2.wad, Tnt.wad, Plutonia.wad," - echo "Heretic.wad or Heretic1.wad ." -fi +%banner -o -e %{name}-common <<'EOF' +To run doomlegacy you need some WAD file: either freedoom package +or some shareware or commercial WAD from Doom or Heretic: +Doom.wad, Doom1.wad, Doom2.wad, Tnt.wad, Plutonia.wad, +Heretic.wad or Heretic1.wad . +EOF %files common %defattr(644,root,root,755) -%doc doomlegacy_142_src/_doc/*.txt +%doc src/_doc/*.txt %dir %{_libdir}/doomlegacy %attr(755,root,root) %{_libdir}/doomlegacy/*serv* %{_datadir}/doomlegacy @@ -162,6 +183,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.39 2011/01/19 23:35:46 glen +- be independant of source tarball structure, use %banner + Revision 1.38 2007/02/12 21:23:53 glen - tabs in preamble ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doomlegacy/doomlegacy.spec?r1=1.38&r2=1.39&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
