rpms/kgrab/devel kgrab-0.1.1-X11_libs.patch, NONE, 1.1 kgrab.spec, 1.23, 1.24 kgrab-0.1.1-libX11.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15324

Modified Files:
	kgrab.spec 
Added Files:
	kgrab-0.1.1-X11_libs.patch 
Removed Files:
	kgrab-0.1.1-libX11.patch 
Log Message:
respin patch


kgrab-0.1.1-X11_libs.patch:
 CMakeLists.txt |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE kgrab-0.1.1-X11_libs.patch ---
diff -up kgrab-0.1.1-kde4.3.3/CMakeLists.txt.libX11 kgrab-0.1.1-kde4.3.3/CMakeLists.txt
--- kgrab-0.1.1-kde4.3.3/CMakeLists.txt.libX11	2009-11-05 05:12:09.000000000 -0600
+++ kgrab-0.1.1-kde4.3.3/CMakeLists.txt	2009-11-05 15:16:49.262571761 -0600
@@ -1,8 +1,13 @@
 project(kgrab)
 
 find_package (KDE4 REQUIRED)
+# X11 is already conditionally pulled in via KDE4 -> Qt, but 
+# since kgrab uses these *un*conditionally... do so here
+find_package (X11 REQUIRED)
+
 include(KDE4Defaults)
-include_directories ( ${KDE4_INCLUDES} )
+include_directories ( ${KDE4_INCLUDES} 
+  ${X11_Xext_INCLUDE_PATH} ${X11_Xshape_INCLUDE_PATH} ${X11_X11_INCLUDE_PATH} )
 
 macro_bool_to_01(X11_Xshape_FOUND HAVE_X11_EXTENSIONS_SHAPE_H)
 configure_file(config-kgrab.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kgrab.h)
@@ -23,7 +28,8 @@ kde4_add_ui_files(kgrab_SRCS kgrabwidget
 
 kde4_add_executable(kgrab ${kgrab_SRCS})
 
-target_link_libraries(kgrab ${KDE4_KIO_LIBS})
+target_link_libraries(kgrab ${KDE4_KIO_LIBS} 
+  ${X11_Xext_LIB} ${X11_Xshape_LIB}${X11_X11_LIB} )
 
 install(TARGETS kgrab ${INSTALL_TARGETS_DEFAULT_ARGS})
 


Index: kgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kgrab/devel/kgrab.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kgrab.spec	5 Nov 2009 21:04:02 -0000	1.23
+++ kgrab.spec	5 Nov 2009 21:17:59 -0000	1.24
@@ -15,8 +15,8 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
-# set explicit -lX11 linkage
-Patch50: kgrab-0.1.1-libX11.patch
+# set explicit X libs linkage
+Patch50: kgrab-0.1.1-X11_libs.patch
 
 BuildRequires:  kdelibs4-devel >= 4
 BuildRequires:  kde-filesystem >= 4
@@ -32,7 +32,8 @@ kgrab is a screen grabbing utility for K
 %prep
 %setup -qn %{name}-%{version}-kde%{kdeversion}
 
-%patch50 -p1 -b .libX11
+%patch50 -p1 -b .X11_libs
+
 
 %build
 


--- kgrab-0.1.1-libX11.patch DELETED ---