packages: termit/termit.spec, termit/termit-as-needed.patch (NEW) - better ...

[draenog]

Author: draenog                      Date: Fri Jan 28 15:24:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- better fix for as-needed issue
- remove duplicated cmake options

---- Files affected:
packages/termit:
   termit.spec (1.26 -> 1.27) , termit-as-needed.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/termit/termit.spec
diff -u packages/termit/termit.spec:1.26 packages/termit/termit.spec:1.27
--- packages/termit/termit.spec:1.26	Thu Jan 27 23:25:29 2011
+++ packages/termit/termit.spec	Fri Jan 28 16:24:48 2011
@@ -12,6 +12,7 @@
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-language.patch
+Patch1:		%{name}-as-needed.patch
 URL:		http://wiki.github.com/nonstop/termit/
 BuildRequires:	cmake >= 2.6.1
 BuildRequires:	gettext-devel
@@ -62,13 +63,10 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
-%cmake . \
-	-DCMAKE_INSTALL_PREFIX:PATH="%{_prefix}" \
-	-DCMAKE_VERBOSE_MAKEFILE=ON
-# fix --as-needed issue - ref: http://pld-linux.org/DevelopingPLD/AdvancedDeveloping/FixingAsNeeded
-%{__perl} -i -p -e 's/((\s-l\S+\s*?)+)((\s\S+\.o\s*?)+)(\s-o termit\s)/\5 \3 \1 /' src/CMakeFiles/termit.dir/link.txt
+%cmake . 
 %{__make}
 
 %install
@@ -101,6 +99,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2011/01/28 15:24:48  draenog
+- better fix for as-needed issue
+- remove duplicated cmake options
+
 Revision 1.26  2011/01/27 22:25:29  draenog
 - better way to avoid g++ requirement
 

================================================================
Index: packages/termit/termit-as-needed.patch
diff -u /dev/null packages/termit/termit-as-needed.patch:1.1
--- /dev/null	Fri Jan 28 16:24:53 2011
+++ packages/termit/termit-as-needed.patch	Fri Jan 28 16:24:48 2011
@@ -0,0 +1,18 @@
+--- src/CMakeLists.txt.orig	2010-12-06 07:35:04.000000000 +0000
++++ src/CMakeLists.txt	2011-01-28 15:20:10.229317193 +0000
+@@ -52,12 +52,11 @@
+ #set_target_properties(${TARGET} PROPERTIES LINK_FLAGS ${TERMIT_LDFLAGS})
+ 
+ SET(TERMIT_LDFLAGS "")
+-FOREACH(ldflag ${VTE_LDFLAGS} ${GTK_LDFLAGS})
+-  SET(TERMIT_LDFLAGS "${TERMIT_LDFLAGS} ${ldflag}")
++FOREACH(ldflag ${VTE_LDFLAGS} ${GTK_LDFLAGS} -lX11)
++  LIST(APPEND TERMIT_LDFLAGS "${ldflag}")
+ ENDFOREACH(ldflag)
+-set_target_properties(${TARGET} PROPERTIES LINK_FLAGS "${TERMIT_LDFLAGS}")
+ 
+-target_link_libraries(${TARGET} ${LUA_LIBRARIES})
++target_link_libraries(${TARGET} ${TERMIT_LDFLAGS} ${LUA_LIBRARIES})
+ 
+ INSTALL(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/termit/termit.spec?r1=1.26&r2=1.27&f=u