Hello community, here is the log from the commit of package kdepim for openSUSE:Factory checked in at 2015-10-19 22:40:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim (Old) and /work/SRC/openSUSE:Factory/.kdepim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim/kdepim.changes 2015-10-03 20:29:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim.new/kdepim.changes 2015-10-19 22:40:27.000000000 +0200 @@ -1,0 +2,16 @@ +Sun Oct 11 13:28:53 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.08.2 + * KDE Applications 15.08.2 + * https://www.kde.org/announcements/announce-applications-15.08.2.php + + +------------------------------------------------------------------- +Fri Oct 9 01:16:32 UTC 2015 - alarr...@suse.com + +- Added disable-qt5uitools-cmake-requirement.diff to be used in SLE12. + Since SLE12 doesn't have cmake 3.0.0, the Qt5::UiTools cmake module + can't be used, so this patch fixes accountwizard and korganizer + to build without using it. + +------------------------------------------------------------------- Old: ---- kdepim-15.08.1.tar.xz New: ---- disable-qt5uitools-cmake-requirement.diff kdepim-15.08.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim.spec ++++++ --- /var/tmp/diff_new_pack.xrK7k7/_old 2015-10-19 22:40:28.000000000 +0200 +++ /var/tmp/diff_new_pack.xrK7k7/_new 2015-10-19 22:40:28.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define create_subdir_filelist(d:f:o:v:) \ %{!-d:echo -e "\\nERROR: missing parameter for macro create_subdir_filelist\\n" ; exit 1 ; } \ filelist=%{-f:%{-f*}}%{!-f:%{-d*}} \ @@ -53,15 +54,16 @@ popd \ %{nil} - Name: kdepim -Version: 15.08.1 +Version: 15.08.2 Release: 0 Summary: Base package of kdepim License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source0: kdepim-%{version}.tar.xz +# PATCH-FIX-OPENSUSE disable-qt5uitools-cmake-requirement.diff alarr...@suse.com -- Don't include cmake files that depend on newer cmake versions +Patch0: disable-qt5uitools-cmake-requirement.diff BuildRequires: akonadi-calendar-devel BuildRequires: akonadi-contact-devel BuildRequires: akonadi-devel @@ -139,6 +141,9 @@ %prep %setup -q -n kdepim-%{version} +%if ! 0%{?is_opensuse} && 0%{?suse_version} == 1315 +%patch0 -p1 +%endif %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKDEPIM_NO_TEXTTOSPEECH=TRUE @@ -173,7 +178,6 @@ grep -v "%{_kf5_libdir}/lib.*so$" filelists/exclude > filelists/exclude.upd rm filelists/devel - %suse_update_desktop_file -r org.kde.blogilo Utility WebUtility %suse_update_desktop_file -u org.kde.akonadiconsole Network Email %suse_update_desktop_file -u org.kde.pimsettingexporter Network Email @@ -187,7 +191,6 @@ %suse_update_desktop_file -r org.kde.akregator Network RSS-News %suse_update_desktop_file org.kde.korganizer Office Calendar - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -196,13 +199,12 @@ Summary: KDE Resources for PIM Storage Service License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE -Requires: kdepim-runtime Requires: akonadi-server +Requires: kdepim-runtime Conflicts: akonadi # Executables: Archive mail agent, followup reminder, mailfilter, notes, sendlateragent, akonadiconsole Conflicts: kdepim4 - %description -n akonadi_resources This package contains the KDE resources for Akonadi, the KDE PIM storage service. ++++++ disable-qt5uitools-cmake-requirement.diff ++++++ Index: kdepim-15.08.1/CMakeLists.txt =================================================================== --- kdepim-15.08.1.orig/CMakeLists.txt +++ kdepim-15.08.1/CMakeLists.txt @@ -83,7 +83,7 @@ option(KDEPIM_BUILD_DESKTOP "Build Deskt option(KDEPIM_NO_WEBKIT "Do not use WebKit in the kdepim applications" FALSE) option(KDEPIM_NO_TEXTTOSPEECH "Do not use TextToSpeech in the kdepim applications" FALSE) -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebKitWidgets Sql Concurrent UiTools Declarative OpenGL) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebKitWidgets Sql Concurrent Declarative OpenGL) find_package(Qt5X11Extras NO_MODULE) if (NOT KDEPIM_NO_TEXTTOSPEECH) find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech) Index: kdepim-15.08.1/accountwizard/CMakeLists.txt =================================================================== --- kdepim-15.08.1.orig/accountwizard/CMakeLists.txt +++ kdepim-15.08.1/accountwizard/CMakeLists.txt @@ -1,8 +1,5 @@ project(accountwizard) -# Qt5 package -find_package(Qt5UiTools ${QT_REQUIRED_VERSION} CONFIG REQUIRED) - find_package(KF5Kross ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED) @@ -70,7 +67,7 @@ set(accountwizard_libs KF5::IdentityManagement KF5::WidgetsAddons KF5::NewStuff - Qt5::UiTools + Qt5UiTools KF5::DBusAddons kdepim ) Index: kdepim-15.08.1/accountwizard/dynamicpage.cpp =================================================================== --- kdepim-15.08.1.orig/accountwizard/dynamicpage.cpp +++ kdepim-15.08.1/accountwizard/dynamicpage.cpp @@ -21,7 +21,7 @@ #include "accountwizard_debug.h" -#include <QUiLoader> +#include <QtUiTools/QUiLoader> #include <QFile> #include <qboxlayout.h> #include <qscrollarea.h> Index: kdepim-15.08.1/korganizer/kcmdesignerfields.cpp =================================================================== --- kdepim-15.08.1.orig/korganizer/kcmdesignerfields.cpp +++ kdepim-15.08.1/korganizer/kcmdesignerfields.cpp @@ -42,7 +42,7 @@ #include <QLabel> #include <QPushButton> #include <QTreeWidget> -#include <QUiLoader> +#include <QtUiTools/QUiLoader> #include <QWhatsThis> #include <QDir> #include <KConfigGroup> Index: kdepim-15.08.1/korganizer/CMakeLists.txt =================================================================== --- kdepim-15.08.1.orig/korganizer/CMakeLists.txt +++ kdepim-15.08.1/korganizer/CMakeLists.txt @@ -84,14 +84,12 @@ if(KDEPIM_BUILD_DESKTOP) kdepim korganizer_core korganizerprivate - Qt5::UiTools + Qt5UiTools KF5::AkonadiCore KF5::CalendarCore KF5::CalendarUtils KF5::Holidays KF5::MailTransport - - Qt5::UiTools pimcommon ) Index: kdepim-15.08.1/korganizer/tests/CMakeLists.txt =================================================================== --- kdepim-15.08.1.orig/korganizer/tests/CMakeLists.txt +++ kdepim-15.08.1/korganizer/tests/CMakeLists.txt @@ -28,7 +28,7 @@ set_target_properties(testkcmdesignerfie target_link_libraries(testkcmdesignerfields KF5::KIOCore KF5::I18n - Qt5::UiTools + Qt5UiTools KF5::KCMUtils KF5::KIOWidgets KF5::KDELibs4Support ++++++ kdepim-15.08.1.tar.xz -> kdepim-15.08.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdepim/kdepim-15.08.1.tar.xz /work/SRC/openSUSE:Factory/.kdepim.new/kdepim-15.08.2.tar.xz differ: char 27, line 1
