Author: glen Date: Thu Mar 3 11:10:50 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.44 alpha2 r778
---- Files affected:
packages/doomlegacy:
doomlegacy.spec (1.43 -> 1.44) , i_sound-pow.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/doomlegacy/doomlegacy.spec
diff -u packages/doomlegacy/doomlegacy.spec:1.43
packages/doomlegacy/doomlegacy.spec:1.44
--- packages/doomlegacy/doomlegacy.spec:1.43 Tue Feb 22 20:50:21 2011
+++ packages/doomlegacy/doomlegacy.spec Thu Mar 3 12:10:45 2011
@@ -5,17 +5,21 @@
%bcond_with x11 # build with System Media Interface (broken,
seems unsupported)
%bcond_without sdl # build with SDL System Media Interface
-%define rel 6
+%define rel 1
Summary: DOOM Legacy for Linux
Summary(pl.UTF-8): DOOM Legacy dla Linuksa
Name: doomlegacy
Version: 1.44
-Release: 0.alpha1.%{rel}
+Release: 0.alpha2.%{rel}
License: GPL, perhaps except for legacy.wad
Group: Applications/Games
-Source0:
http://doomlegacy.sourceforge.net/releases/%{name}_144_alpha1_src_r752.zip
-# Source0-md5: e1cc5039872dc70e506cd427a9015080
-# legacy wad extracted from binary archive:
doomlegacy_144_alpha1_linux2.4_32bit.zip
+#Source0:
http://doomlegacy.sourceforge.net/releases/%{name}_144_alpha2_src_r777.zip
+# no upstream source, so create our own
+# svn export
https://doomlegacy.svn.sourceforge.net/svnroot/doomlegacy/legacy_one/trunk@778
doomlegacy_144_alpha2
+# zip -r doomlegacy_144_alpha2_src_r778.zip doomlegacy_144_alpha2
+Source0: %{name}_144_alpha2_src_r778.zip
+# Source0-md5: ab732fe33f1e2dcb8f79f6025544895a
+# legacy wad extracted from binary archive:
doomlegacy_144_alpha2_linux2.4_32bit.zip
Source1: http://carme.pld-linux.org/~glen/legacy.wad
# Source1-md5: 2c29a4d7cedcf95d09dec71c41025aa5
Source4: %{name}-x11.desktop
@@ -87,7 +91,7 @@
%prep
%setup -qc
-mv trunk src
+mv doomlegacy_144_alpha2 src
cd src
%patch0 -p1
%patch1 -p2
@@ -193,6 +197,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.44 2011/03/03 11:10:45 glen
+- up to 1.44 alpha2 r778
+
Revision 1.43 2011/02/22 19:50:21 glen
- fix ldflags, rel 6
================================================================
Index: packages/doomlegacy/i_sound-pow.patch
diff -u packages/doomlegacy/i_sound-pow.patch:1.1
packages/doomlegacy/i_sound-pow.patch:1.2
--- packages/doomlegacy/i_sound-pow.patch:1.1 Thu Jan 20 02:30:42 2011
+++ packages/doomlegacy/i_sound-pow.patch Thu Mar 3 12:10:45 2011
@@ -1,13 +1,13 @@
i_sound.c needs -lm for pow()
---- doomlegacy-1.44/src/Makefile~ 2011-01-20 03:20:12.000000000 +0200
-+++ doomlegacy-1.44/src/Makefile 2011-01-20 03:21:30.240842662 +0200
-@@ -115,7 +115,7 @@
+--- doomlegacy-1.44/src/Makefile~ 2011-03-03 13:06:33.000000000 +0200
++++ doomlegacy-1.44/src/Makefile 2011-03-03 13:07:20.011250325 +0200
+@@ -122,7 +122,7 @@
else
- # default is Linux
+ # default is Linux, for all unix SDL
OPTS := -DLINUX
-- LIBS := -lGL -lGLU
-+ LIBS := -lGL -lGLU -lm
+- LIBS := -lGL -lGLU -L/usr/X11R6/lib
++ LIBS := -lGL -lGLU -L/usr/X11R6/lib -lm
+ # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have
+ # the GLU libraries in an X11 directory.
endif
-
- OPTS += -DHWRENDER -DSDL $(shell sdl-config --cflags) -I.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doomlegacy/doomlegacy.spec?r1=1.43&r2=1.44&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doomlegacy/i_sound-pow.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
