rpms/kdepim/devel kdepim-4.1.80-libqgpgme-link-fix.patch, NONE, 1.1 kdepim.spec, 1.194, 1.195

[Lorenzo Villani]

Author: arbiter

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

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.1.80-libqgpgme-link-fix.patch 
Log Message:
* Fri Nov 28 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-3
- kdepim-4.1.80-libqgpgme-link-fix.patch
  fix libqgpgme linking errors


kdepim-4.1.80-libqgpgme-link-fix.patch:

--- NEW FILE kdepim-4.1.80-libqgpgme-link-fix.patch ---
diff -Naur kdepim-4.1.80/kleopatra/kgpgconf/CMakeLists.txt kdepim-4.1.80.libqgpgme-link-fix/kleopatra/kgpgconf/CMakeLists.txt
--- kdepim-4.1.80/kleopatra/kgpgconf/CMakeLists.txt	2008-11-04 18:12:56.000000000 +0100
+++ kdepim-4.1.80.libqgpgme-link-fix/kleopatra/kgpgconf/CMakeLists.txt	2008-11-28 20:28:00.000000000 +0100
@@ -21,7 +21,7 @@
 kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
 
 kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARY} ${KDE4_KDEUI_LIBS} )
 
 install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
 
diff -Naur kdepim-4.1.80/libkleo/CMakeLists.txt kdepim-4.1.80.libqgpgme-link-fix/libkleo/CMakeLists.txt
--- kdepim-4.1.80/libkleo/CMakeLists.txt	2008-11-04 18:12:56.000000000 +0100
+++ kdepim-4.1.80.libqgpgme-link-fix/libkleo/CMakeLists.txt	2008-11-28 18:56:14.000000000 +0100
@@ -108,7 +108,7 @@
 if(WIN32)
 target_link_libraries(kleo ${kleo_LIB_LIBS}  ${GPGME_VANILLA_LIBRARIES} )
 else(WIN32)
-target_link_libraries(kleo ${kleo_LIB_LIBS} )
+target_link_libraries(kleo ${kleo_LIB_LIBS} ${KDE4_QGPGME_LIBRARY} )
 endif(WIN32)
 set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- kdepim.spec	20 Nov 2008 15:38:40 -0000	1.194
+++ kdepim.spec	28 Nov 2008 20:06:51 -0000	1.195
@@ -6,12 +6,13 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.1.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdepim4 = %{version}-%{release}
@@ -86,6 +87,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
 
@@ -172,6 +174,10 @@
 
 
 %changelog
+* Fri Nov 28 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-3
+- kdepim-4.1.80-libqgpgme-link-fix.patch
+  fix libqgpgme linking errors
+
 * Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
 - merged