diff --git a/kdepim-4.1.80-libqgpgme-link-fix.patch b/kdepim-4.1.80-libqgpgme-link-fix.patch new file mode 100644 index 0000000..3d66432 --- /dev/null +++ b/kdepim-4.1.80-libqgpgme-link-fix.patch @@ -0,0 +1,24 @@ +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}) diff --git a/kdepim.spec b/kdepim.spec index c827004..93f6944 100644 --- a/kdepim.spec +++ b/kdepim.spec @@ -6,12 +6,13 @@ Name: kdepim 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 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q +%patch0 -p1 -b .libqgpgme-link-fix # upstream patches @@ -172,6 +174,10 @@ rm -rf %{buildroot} %changelog +* Fri Nov 28 2008 Lorenzo Villani - 6:4.1.80-3 +- kdepim-4.1.80-libqgpgme-link-fix.patch + fix libqgpgme linking errors + * Thu Nov 20 2008 Than Ngo 4.1.80-2 - merged