Author: evil Date: Sun Feb 20 00:57:56 2011 GMT Module: packages Tag: HEAD ---- Log message: - remove compiled lua scripts - added install_once.patch preventing double installation of some data files
---- Files affected: packages/kqthebetrayer: kqthebetrayer.spec (1.3 -> 1.4) , kqthebetrayer-install_once.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kqthebetrayer/kqthebetrayer.spec diff -u packages/kqthebetrayer/kqthebetrayer.spec:1.3 packages/kqthebetrayer/kqthebetrayer.spec:1.4 --- packages/kqthebetrayer/kqthebetrayer.spec:1.3 Mon Feb 7 00:18:03 2011 +++ packages/kqthebetrayer/kqthebetrayer.spec Sun Feb 20 01:57:51 2011 @@ -12,6 +12,7 @@ URL: http://virtualkingdoms.net/kqthebetrayer/ Source1: %{name}.desktop Patch0: %{name}-naming_scheme.patch +Patch1: %{name}-install_once.patch BuildRequires: allegro-devel >= 4.2.1 BuildRequires: autoconf BuildRequires: automake @@ -36,10 +37,14 @@ %prep %setup -q -n %{name}%{version}src %patch0 +%patch1 -p1 %{__sed} 's/luac/luac50/g' -i scripts/Makefile.{am,in} +# workaround for not fully cleaned scripts dir from compiled lua files: +rm scripts/*.lob %build CFLAGS="-I/usr/include/lua50 %{rpmcflags}" +LDFLAGS="-lm %{rpmldflags}" %{__aclocal} %{__autoconf} %{__automake} @@ -49,7 +54,8 @@ %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +#%{__make} install \ +make install \ DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} @@ -82,6 +88,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2011/02/20 00:57:51 evil +- remove compiled lua scripts +- added install_once.patch preventing double installation of some data files + Revision 1.3 2011/02/06 23:18:03 sparky - unified preamble in %changelog ================================================================ Index: packages/kqthebetrayer/kqthebetrayer-install_once.patch diff -u /dev/null packages/kqthebetrayer/kqthebetrayer-install_once.patch:1.1 --- /dev/null Sun Feb 20 01:57:57 2011 +++ packages/kqthebetrayer/kqthebetrayer-install_once.patch Sun Feb 20 01:57:51 2011 @@ -0,0 +1,82 @@ +--- kqthebetrayer0.2.7src/Makefile.in.orig 2011-02-20 01:38:13.330480759 +0100 ++++ kqthebetrayer0.2.7src/Makefile.in 2011-02-20 01:41:51.364339375 +0100 +@@ -340,16 +340,16 @@ + maps/capital.map maps/haunt.map maps/shrine.map \ + maps/townx2.map maps/tunnel2.map maps/castle.map \ + maps/hq.map maps/townx3.map maps/tunnel.map \ +- maps/cavex1.map maps/land1.map maps/townx3.map \ ++ maps/cavex1.map maps/land1.map \ + maps/villagex.map + + mapdir = $(pkgdatadir)/maps + cscripts_DATA = scripts/starting.lob scripts/starting2.lob \ + scripts/townx.lob scripts/glade.lob \ +- scripts/global.lob scripts/land.lob scripts/starting.lob \ ++ scripts/global.lob scripts/land.lob \ + scripts/init.lob scripts/townx4.lob scripts/glade2.lob \ + scripts/tunnel.lob scripts/tunnel2.lob scripts/villagex.lob \ +- scripts/capital.lob scripts/hq.lob scripts/townx4.lob \ ++ scripts/capital.lob scripts/hq.lob \ + scripts/haunt.lob scripts/shrine.lob scripts/blacksmith.lob \ + scripts/cavex1.lob scripts/manorx.lob + +@@ -360,7 +360,7 @@ + scripts/global.lua scripts/init.lua scripts/townx4.lua \ + scripts/glade2.lua scripts/tunnel.lua scripts/tunnel2.lua \ + scripts/villagex.lua scripts/capital.lua scripts/hq.lua \ +- scripts/townx4.lua scripts/haunt.lua scripts/shrine.lua \ ++ scripts/haunt.lua scripts/shrine.lua \ + scripts/blacksmith.lua scripts/cavex1.lua scripts/manorx.lua \ + Mac/Info.plist Mac/KQ-icon.icns maps/mapdraw2.glade \ + other/kq.ico +@@ -373,7 +373,7 @@ + music/walk.s3m music/comeback.mod music/hm.s3m music/rain.s3m \ + music/waterw.xm music/dag_4.xm music/infanita.mod music/rend5.s3m \ + music/enfero.xm music/into61.s3m music/toroia.s3m music/eranasp.mod \ +- music/land.mod music/town.mod music/comeback.mod music/grseed.s3m \ ++ music/land.mod music/town.mod music/grseed.s3m \ + music/res.xm music/renc1.s3m + + musicdir = $(pkgdatadir)/music +--- kqthebetrayer0.2.7src/Makefile.am.orig 2011-02-20 01:53:47.971475687 +0100 ++++ kqthebetrayer0.2.7src/Makefile.am 2011-02-20 01:55:23.927725504 +0100 +@@ -64,7 +64,7 @@ + maps/capital.map maps/haunt.map maps/shrine.map \ + maps/townx2.map maps/tunnel2.map maps/castle.map \ + maps/hq.map maps/townx3.map maps/tunnel.map \ +- maps/cavex1.map maps/land1.map maps/townx3.map \ ++ maps/cavex1.map maps/land1.map \ + maps/villagex.map + + +@@ -72,10 +72,10 @@ + + cscripts_DATA = scripts/starting.lob scripts/starting2.lob \ + scripts/townx.lob scripts/glade.lob \ +- scripts/global.lob scripts/land.lob scripts/starting.lob \ ++ scripts/global.lob scripts/land.lob \ + scripts/init.lob scripts/townx4.lob scripts/glade2.lob \ + scripts/tunnel.lob scripts/tunnel2.lob scripts/villagex.lob \ +- scripts/capital.lob scripts/hq.lob scripts/townx4.lob \ ++ scripts/capital.lob scripts/hq.lob \ + scripts/haunt.lob scripts/shrine.lob scripts/blacksmith.lob \ + scripts/cavex1.lob scripts/manorx.lob + MOSTLYCLEANFILES = $(cscripts_DATA) +@@ -86,7 +86,7 @@ + scripts/global.lua scripts/init.lua scripts/townx4.lua \ + scripts/glade2.lua scripts/tunnel.lua scripts/tunnel2.lua \ + scripts/villagex.lua scripts/capital.lua scripts/hq.lua \ +- scripts/townx4.lua scripts/haunt.lua scripts/shrine.lua \ ++ scripts/haunt.lua scripts/shrine.lua \ + scripts/blacksmith.lua scripts/cavex1.lua scripts/manorx.lua \ + Mac/Info.plist Mac/KQ-icon.icns maps/mapdraw2.glade \ + other/kq.ico +@@ -100,7 +100,7 @@ + music/walk.s3m music/comeback.mod music/hm.s3m music/rain.s3m \ + music/waterw.xm music/dag_4.xm music/infanita.mod music/rend5.s3m \ + music/enfero.xm music/into61.s3m music/toroia.s3m music/eranasp.mod \ +- music/land.mod music/town.mod music/comeback.mod music/grseed.s3m \ ++ music/land.mod music/town.mod music/grseed.s3m \ + music/res.xm music/renc1.s3m + + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kqthebetrayer/kqthebetrayer.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
