rpms/kvkbd/devel kvkbd-0.6-DSO-linking-fix.patch, NONE, 1.1 kvkbd.spec, 1.2, 1.3

[Radek Novacek]

Author: rnovacek

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

Modified Files:
	kvkbd.spec 
Added Files:
	kvkbd-0.6-DSO-linking-fix.patch 
Log Message:
* Mon Feb 15 2010 Radek Novacek <rnovacek at redhat.com> - 0.6-3
- Fixed breakage by DSO change (rhbz #564892)


kvkbd-0.6-DSO-linking-fix.patch:
 CMakeLists.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kvkbd-0.6-DSO-linking-fix.patch ---
diff -up kvkbd-0.6/src/CMakeLists.txt.DSO-linking-fix kvkbd-0.6/src/CMakeLists.txt
--- kvkbd-0.6/src/CMakeLists.txt.DSO-linking-fix	2010-02-15 13:57:11.000000000 +0100
+++ kvkbd-0.6/src/CMakeLists.txt	2010-02-15 13:57:51.000000000 +0100
@@ -1,6 +1,7 @@
 find_package(KDE4 REQUIRED)
 
 find_package(LibXslt REQUIRED)
+find_package(X11 REQUIRED)
 
 include_directories( ${KDE4_INCLUDES} )
 
@@ -22,7 +23,7 @@ QT4_ADD_DBUS_ADAPTOR(kvkbd_SRCS org.kde.
 
 kde4_add_executable(kvkbd ${kvkbd_SRCS})
 
-target_link_libraries(kvkbd ${KDE4_KDECORE_LIBS} Xtst ${KDE4_KDEUI_LIBS})
+target_link_libraries(kvkbd ${KDE4_KDECORE_LIBS} Xtst ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
 
 install(TARGETS kvkbd ${INSTALL_TARGETS_DEFAULT_ARGS})
 


Index: kvkbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvkbd/devel/kvkbd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kvkbd.spec	25 Jul 2009 04:51:32 -0000	1.2
+++ kvkbd.spec	15 Feb 2010 13:11:44 -0000	1.3
@@ -1,12 +1,14 @@
 Name:           kvkbd
 Version:        0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Virtual keyboard for KDE
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.kde-apps.org/content/show.php/Kvkbd+-+KDE4?content=94374
 Source0:        http://www.kde-apps.org/CONTENT/content-files/94374-%{name}-%{version}.tar.bz2
+# Patch to handle change of DSO linking (rhbz #564892)
+Patch0:	        kvkbd-0.6-DSO-linking-fix.patch	
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake kdelibs-devel libxslt-devel
@@ -20,7 +22,7 @@ layout, scripting with DBus, etc.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .DSO-linking-fix.patch
 
 %build
 mkdir -p %{_target_platform}
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/kvkbd/
 
 %changelog
+* Mon Feb 15 2010 Radek Novacek <rnovacek at redhat.com> - 0.6-3
+- Fixed breakage by DSO change (rhbz #564892)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild