Hello community, here is the log from the commit of package kdelibs4 checked in at Sat Apr 12 21:16:33 CEST 2008. -------- --- KDE/kdelibs4/kdelibs4.changes 2008-04-10 16:28:33.000000000 +0200 +++ kdelibs4/kdelibs4.changes 2008-04-10 16:40:23.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 10 16:38:10 CEST 2008 - dmueller@suse.de + +- fix detection of KDE 4.1 akonadi backport + +------------------------------------------------------------------- New: ---- akonadi-4.1-lib.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.GE3787/_old 2008-04-12 21:16:04.000000000 +0200 +++ /var/tmp/diff_new_pack.GE3787/_new 2008-04-12 21:16:04.000000000 +0200 @@ -26,7 +26,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.0.3 -Release: 6 +Release: 7 %define rversion 4.0.3 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -47,6 +47,7 @@ Patch7: kde3-autostart.diff Patch8: UDS_TARGET_URL.diff Patch9: r793577.diff +Patch10: akonadi-4.1-lib.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,6 +73,7 @@ %patch7 %patch8 %patch9 +%patch10 # # define KDE version exactly # @@ -353,6 +355,8 @@ /usr/share/autostart/kdesktop.desktop %changelog +* Thu Apr 10 2008 dmueller@suse.de +- fix detection of KDE 4.1 akonadi backport * Thu Apr 10 2008 stbinner@suse.de - don't dump mime types of KDE3 apps but give it only low priority * Thu Apr 10 2008 ro@suse.de ++++++ 4_0_BRANCH.diff ++++++ ++++ 3993 lines (skipped) ++++ between KDE/kdelibs4/4_0_BRANCH.diff ++++ and kdelibs4/4_0_BRANCH.diff ++++++ akonadi-4.1-lib.diff ++++++ Subject: fix detection of KDE 4.1 akonadi libs Patch-Upstream: Yes Signed-Off-By: dirk --- cmake/modules/FindKdepimLibs.cmake +++ cmake/modules/FindKdepimLibs.cmake @@ -32,6 +32,12 @@ # this file contains all dependencies of all libraries of kdepimlibs, Alex include(KDEPimLibsDependencies) + find_library(KDE4_AKONADI_LIBRARY NAMES akonadi-kde PATHS ${KDE4_LIB_DIR} NO_DEFAULT_PATH ) + set(KDE4_AKONADI_LIBS ${akonadi_LIB_DEPENDS} ${KDE4_AKONADI_LIBRARY} ) + + find_library(KDE4_AKONADI_KMIME_LIBRARY NAMES akonadi-kmime PATHS ${KDE4_LIB_DIR} NO_DEFAULT_PATH ) + set(KDE4_AKONADI_KMIME_LIBS ${akonadi_kmime_LIB_DEPENDS} ${KDE4_AKONADI_KMIME_LIBRARY} ) + find_library(KDE4_GPGMEPP_LIBRARY NAMES gpgme++ PATHS ${KDE4_LIB_DIR} NO_DEFAULT_PATH ) set(KDE4_GPGMEPP_LIBS ${gpgmepp_LIB_DEPENDS} ${KDE4_GPGMEPP_LIBRARY} ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de