From 0abefeac3643240301a5b1047b87f121836bb26f8e3c41b80839b68a1fee4ffe Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 11 Apr 2016 06:29:57 +0000 Subject: [PATCH 01/13] update to (16.03.90) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=29 --- akonadi-15.12.3.tar.xz | 3 --- akonadi-16.03.90.tar.xz | 3 +++ akonadi-server.changes | 8 ++++++++ akonadi-server.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 akonadi-15.12.3.tar.xz create mode 100644 akonadi-16.03.90.tar.xz diff --git a/akonadi-15.12.3.tar.xz b/akonadi-15.12.3.tar.xz deleted file mode 100644 index af817e8..0000000 --- a/akonadi-15.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e8d29e2e14a51b7445f2d634b3dfefcfb124532a5f7c575a9b2a48e9ce61f9f -size 287728 diff --git a/akonadi-16.03.90.tar.xz b/akonadi-16.03.90.tar.xz new file mode 100644 index 0000000..15d8781 --- /dev/null +++ b/akonadi-16.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:478716cda31644203f2f641eeedfc8e2253c3bdeab6ac596c7848a4391f3dcb8 +size 1020412 diff --git a/akonadi-server.changes b/akonadi-server.changes index 01f1a79..7d66fe6 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 11 06:29:53 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + ------------------------------------------------------------------- Sun Mar 13 15:32:26 UTC 2016 - tittiatcoke@gmail.com diff --git a/akonadi-server.spec b/akonadi-server.spec index a360352..ab7a455 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -17,7 +17,7 @@ Name: akonadi-server -Version: 15.12.3 +Version: 16.03.90 Release: 0 %define rname akonadi Summary: PIM Storage Service From 287a47c8611058997d388e403e88eb71044c7f384773b99c2add1eacd275c2ee Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 11 Apr 2016 08:16:37 +0000 Subject: [PATCH 02/13] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=30 --- akonadi-server.spec | 117 +++++++++++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 46 deletions(-) diff --git a/akonadi-server.spec b/akonadi-server.spec index ab7a455..f7a1e6d 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -28,14 +28,29 @@ Source: %{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc BuildRequires: boost-devel BuildRequires: cmake >= 2.8.9 -BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libxml2 BuildRequires: libxslt BuildRequires: mariadb -BuildRequires: postgresql-devel BuildRequires: shared-mime-info BuildRequires: sqlite3-devel +BuildRequires: postgresql-devel +BuildRequires: extra-cmake-modules +BuildRequires: cmake(KF5ItemViews) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5DesignerPlugin) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5ItemModels) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(KF5Completion) +BuildRequires: cmake(Qt5Designer) +BuildRequires: boost-devel +BuildRequires: libxslt-devel +BuildRequires: libxslt-tools BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) @@ -56,36 +71,32 @@ Obsoletes: akonadi-runtime < %{version} %else Conflicts: akonadi-runtime %endif +Obsoletes: akonadi5 < %{version} +Provides: akonadi5 = %{version} +Obsoletes: libKF5AkonadiPrivate5 < %{version} +Provides: libKF5AkonadiPrivate5 = %{version} %description This package contains the data files of Akonadi, the KDE PIM storage service. -%package -n libKF5AkonadiPrivate-devel -Summary: PIM Storage Service: Build Environment -Group: Development/Libraries/X11 -Requires: %{name} = %{version} -Requires: libKF5AkonadiPrivate5 = %{version} -%if 0%{?suse_version} > 1320 -Obsoletes: libakonadiprotocolinternals-devel < %{version} -%else -Conflicts: libakonadiprotocolinternals-devel -%endif - -%description -n libKF5AkonadiPrivate-devel -This package contains development files of Akonadi, the KDE PIM storage -service. - -%package -n libKF5AkonadiPrivate5 -Summary: PIM Storage Service -Group: System/GUI/KDE - -%description -n libKF5AkonadiPrivate5 +%description This package contains the data files of Akonadi, the KDE PIM storage service. +%package devel +Summary: Akonadi Framework: Build Environment +Group: Development/Libraries/X11 +Requires: %{name} = %{version} +Obsoletes: libKF5AkonadiPrivate-devel < %{version} +Provides: libKF5AkonadiPrivate-devel = %{version} + +%description devel +This package contains development files of Akonadi, the KDE PIM storage +service. + %prep -%setup -q -n %{rname}-%{version} +%setup -q -n %{name}-%{version} %build %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} @@ -102,35 +113,49 @@ service. /sbin/ldconfig %{_kf5_bindir}/update-mime-database %{_kf5_sharedir}/mime &> /dev/null || : -%post -n libKF5AkonadiPrivate5 -p /sbin/ldconfig - -%postun -n libKF5AkonadiPrivate5 -p /sbin/ldconfig - %files %defattr(-,root,root) -%doc lgpl-license AUTHORS README* -%dir %{_kf5_sysconfdir}/xdg/akonadi -%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf -%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf -%{_kf5_bindir}/akonadi* %{_kf5_bindir}/asapcat -%{_kf5_plugindir}/sqldrivers/libqsqlite3.so -%{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service -%{_kf5_sharedir}/mime/packages/akonadi-mime.xml +%{_kf5_bindir}/akonadi* +%dir %{_kf5_sysconfdir}/xdg/akonadi %{_kf5_sysconfdir}/xdg/akonadi.categories - -%files -n libKF5AkonadiPrivate-devel -%defattr(-,root,root) -%doc lgpl-license -%dir %{_kf5_libdir}/cmake -%{_kf5_includedir}/akonadi/ -%{_kf5_libdir}/cmake/KF5AkonadiServer/ -%{_kf5_libdir}/libKF5AkonadiPrivate.so +%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf +%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf +%{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service %{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml +%{_kf5_sharedir}/mime/packages/akonadi-mime.xml +%{_kf5_plugindir}/sqldrivers/libqsqlite3.so +%{_datadir}/kf5/akonadi/ +%dir %{_kf5_configkcfgdir} +%{_kf5_configkcfgdir}/resourcebase.kcfg +%{_kf5_plugindir}/designer/ +%{_libdir}/libKF5AkonadiPrivate.so.* +%{_libdir}/libKF5AkonadiCore.so.* +%{_libdir}/libKF5AkonadiAgentBase.so.* +%{_libdir}/libKF5AkonadiWidgets.so.* +%{_libdir}/libKF5AkonadiXml.so.* +%{_kf5_plugindir}/akonadi/ +%{_datadir}/akonadi/ +%{_datadir}/kf5/akonadi_knut_resource/ -%files -n libKF5AkonadiPrivate5 +%files devel %defattr(-,root,root) -%doc lgpl-license -%{_kf5_libdir}/libKF5AkonadiPrivate.so.* +%{_kf5_includedir}/akonadi/ +%{_kf5_includedir}/AkonadiCore/ +%{_kf5_includedir}/AkonadiAgentBase/ +%{_kf5_includedir}/AkonadiWidgets/ +%{_kf5_includedir}/AkonadiXml/ +%dir %{_kf5_libdir}/cmake +%{_kf5_libdir}/cmake/KF5Akonadi +%{_kf5_includedir}/akonadi_version.h +%{_libdir}/libKF5AkonadiPrivate.so +%{_libdir}/libKF5AkonadiCore.so +%{_libdir}/qt5/mkspecs/modules/qt_AkonadiCore.pri +%{_libdir}/libKF5AkonadiAgentBase.so +%{_libdir}/qt5/mkspecs/modules/qt_AkonadiAgentBase.pri +%{_libdir}/libKF5AkonadiWidgets.so +%{_libdir}/qt5/mkspecs/modules/qt_AkonadiWidgets.pri +%{_libdir}/libKF5AkonadiXml.so +%{_libdir}/qt5/mkspecs/modules/qt_AkonadiXml.pri %changelog From 869e6fe88085b96632f066bf47d25620d60d6fec466a9e4497592a235347c597 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 11 Apr 2016 08:27:57 +0000 Subject: [PATCH 03/13] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=31 --- akonadi-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akonadi-server.spec b/akonadi-server.spec index f7a1e6d..7903ea2 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -96,7 +96,7 @@ This package contains development files of Akonadi, the KDE PIM storage service. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{rname}-%{version} %build %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} From 8915c8f9629bff0aa060c554d28ce15dca8860d4d98f9554b15ee1bb65eddb93 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 06:16:21 +0000 Subject: [PATCH 04/13] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=32 --- akonadi-server.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/akonadi-server.spec b/akonadi-server.spec index 7903ea2..0ee91fe 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -62,7 +62,6 @@ BuildRequires: pkgconfig(Qt5Xml) BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): shared-mime-info Requires(postun): shared-mime-info -Requires: libKF5AkonadiPrivate5 = %{version} Requires: libqt5-sql-mysql Requires: mysql Suggests: mariadb From 8dff3af897c70ec980e86ae70654b8dd75f8f9bf2ff4ec8685abdbf877d91721 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 12 Apr 2016 12:45:45 +0000 Subject: [PATCH 05/13] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=33 --- akonadi-server.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/akonadi-server.spec b/akonadi-server.spec index 0ee91fe..5d5fc42 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -48,7 +48,6 @@ BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(KF5Completion) BuildRequires: cmake(Qt5Designer) -BuildRequires: boost-devel BuildRequires: libxslt-devel BuildRequires: libxslt-tools BuildRequires: pkgconfig(Qt5Core) From 46bd3ad0546e3912a812f5ee3a5a6b87c5545be9677f989c9f5ff6721643a118 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 17 Apr 2016 05:48:55 +0000 Subject: [PATCH 06/13] update to (16.04.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=34 --- akonadi-16.03.90.tar.xz | 3 --- akonadi-16.04.0.tar.xz | 3 +++ akonadi-server.changes | 8 ++++++++ akonadi-server.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 akonadi-16.03.90.tar.xz create mode 100644 akonadi-16.04.0.tar.xz diff --git a/akonadi-16.03.90.tar.xz b/akonadi-16.03.90.tar.xz deleted file mode 100644 index 15d8781..0000000 --- a/akonadi-16.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:478716cda31644203f2f641eeedfc8e2253c3bdeab6ac596c7848a4391f3dcb8 -size 1020412 diff --git a/akonadi-16.04.0.tar.xz b/akonadi-16.04.0.tar.xz new file mode 100644 index 0000000..94d57c3 --- /dev/null +++ b/akonadi-16.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3394816cd5e8bfd4dfbf177c040f601e084f15b0d0feea7aa7de0fcfa318a006 +size 1020700 diff --git a/akonadi-server.changes b/akonadi-server.changes index 7d66fe6..3013776 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Apr 17 05:48:49 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + ------------------------------------------------------------------- Mon Apr 11 06:29:53 UTC 2016 - tittiatcoke@gmail.com diff --git a/akonadi-server.spec b/akonadi-server.spec index 5d5fc42..68ea531 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -17,7 +17,7 @@ Name: akonadi-server -Version: 16.03.90 +Version: 16.04.0 Release: 0 %define rname akonadi Summary: PIM Storage Service From 597313bbb31a57da66b2fbe7a1d9f68428f540aa681a9fce2b3fb39778a6960c Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 27 Apr 2016 21:42:05 +0000 Subject: [PATCH 07/13] - Move dbus xml files to the akonadi-devel package - Make the devel package conflict with libakonadiprotocolinternals-devel OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=35 --- akonadi-server.changes | 7 +++++++ akonadi-server.spec | 37 +++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/akonadi-server.changes b/akonadi-server.changes index 3013776..8542625 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 27 21:40:31 UTC 2016 - lbeltrame@kde.org + +- Move dbus xml files to the akonadi-devel package +- Make the devel package conflict with + libakonadiprotocolinternals-devel + ------------------------------------------------------------------- Sun Apr 17 05:48:49 UTC 2016 - tittiatcoke@gmail.com diff --git a/akonadi-server.spec b/akonadi-server.spec index 68ea531..220f412 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -28,28 +28,28 @@ Source: %{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc BuildRequires: boost-devel BuildRequires: cmake >= 2.8.9 +BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libxml2 BuildRequires: libxslt -BuildRequires: mariadb -BuildRequires: shared-mime-info -BuildRequires: sqlite3-devel -BuildRequires: postgresql-devel -BuildRequires: extra-cmake-modules -BuildRequires: cmake(KF5ItemViews) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5DesignerPlugin) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5ItemModels) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(Qt5Designer) BuildRequires: libxslt-devel BuildRequires: libxslt-tools +BuildRequires: mariadb +BuildRequires: postgresql-devel +BuildRequires: shared-mime-info +BuildRequires: sqlite3-devel +BuildRequires: cmake(KF5Completion) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DesignerPlugin) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5ItemModels) +BuildRequires: cmake(KF5ItemViews) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(Qt5Designer) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) @@ -88,6 +88,7 @@ Group: Development/Libraries/X11 Requires: %{name} = %{version} Obsoletes: libKF5AkonadiPrivate-devel < %{version} Provides: libKF5AkonadiPrivate-devel = %{version} +Conflicts: libakonadiprotocolinternals-devel %description devel This package contains development files of Akonadi, the KDE PIM storage @@ -120,7 +121,6 @@ service. %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf %{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service -%{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %{_kf5_sharedir}/mime/packages/akonadi-mime.xml %{_kf5_plugindir}/sqldrivers/libqsqlite3.so %{_datadir}/kf5/akonadi/ @@ -146,6 +146,7 @@ service. %dir %{_kf5_libdir}/cmake %{_kf5_libdir}/cmake/KF5Akonadi %{_kf5_includedir}/akonadi_version.h +%{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %{_libdir}/libKF5AkonadiPrivate.so %{_libdir}/libKF5AkonadiCore.so %{_libdir}/qt5/mkspecs/modules/qt_AkonadiCore.pri From c561e6cd368b21a32ba63f59828c61312577ba3f93a692d4cea03e9aca1a8aab Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 28 Apr 2016 05:36:48 +0000 Subject: [PATCH 08/13] - Move akonadi2xml to devel package OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=36 --- akonadi-server.changes | 5 +++++ akonadi-server.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/akonadi-server.changes b/akonadi-server.changes index 8542625..b4668bf 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 28 05:36:04 UTC 2016 - lbeltrame@kde.org + +- Move akonadi2xml to devel package + ------------------------------------------------------------------- Wed Apr 27 21:40:31 UTC 2016 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index 220f412..e1ca468 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -115,7 +115,11 @@ service. %files %defattr(-,root,root) %{_kf5_bindir}/asapcat -%{_kf5_bindir}/akonadi* +%{_kf5_bindir}/akonadi_* +%{_kf5_bindir}/akonadictl +%{_kf5_bindir}/akonadiselftest +%{_kf5_bindir}/akonadiserver +%{_kf5_bindir}/akonaditest %dir %{_kf5_sysconfdir}/xdg/akonadi %{_kf5_sysconfdir}/xdg/akonadi.categories %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf @@ -138,6 +142,7 @@ service. %files devel %defattr(-,root,root) +%{_kf5_bindir}/akonadi2xml %{_kf5_includedir}/akonadi/ %{_kf5_includedir}/AkonadiCore/ %{_kf5_includedir}/AkonadiAgentBase/ From b6dc1cd1dd0bcc40e8750c853051323aafff0a6845125e4231217b4e7a453bc3 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 7 May 2016 10:10:09 +0000 Subject: [PATCH 09/13] update to (16.04.1) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=37 --- akonadi-16.04.0.tar.xz | 3 --- akonadi-16.04.1.tar.xz | 3 +++ akonadi-server.changes | 8 ++++++++ akonadi-server.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 akonadi-16.04.0.tar.xz create mode 100644 akonadi-16.04.1.tar.xz diff --git a/akonadi-16.04.0.tar.xz b/akonadi-16.04.0.tar.xz deleted file mode 100644 index 94d57c3..0000000 --- a/akonadi-16.04.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3394816cd5e8bfd4dfbf177c040f601e084f15b0d0feea7aa7de0fcfa318a006 -size 1020700 diff --git a/akonadi-16.04.1.tar.xz b/akonadi-16.04.1.tar.xz new file mode 100644 index 0000000..69bed93 --- /dev/null +++ b/akonadi-16.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e1b16406bde573dcb9e482d580268dd358706c7c8c1b336170c5e367f2c66c6 +size 1021384 diff --git a/akonadi-server.changes b/akonadi-server.changes index b4668bf..1319f6c 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat May 7 10:10:06 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + ------------------------------------------------------------------- Thu Apr 28 05:36:04 UTC 2016 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index e1ca468..ec8bdee 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -17,7 +17,7 @@ Name: akonadi-server -Version: 16.04.0 +Version: 16.04.1 Release: 0 %define rname akonadi Summary: PIM Storage Service From eb684b1559101bdbf56ad48753f12d3c28918eb80b1017e8dda984c8accb9650 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 19 May 2016 13:12:46 +0000 Subject: [PATCH 10/13] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=38 --- akonadi-server.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/akonadi-server.spec b/akonadi-server.spec index ec8bdee..2e68422 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -87,6 +87,7 @@ Summary: Akonadi Framework: Build Environment Group: Development/Libraries/X11 Requires: %{name} = %{version} Obsoletes: libKF5AkonadiPrivate-devel < %{version} +Obsoletes: akonadi-devel < %{version} Provides: libKF5AkonadiPrivate-devel = %{version} Conflicts: libakonadiprotocolinternals-devel From f1e792463f7a0fdffe47e7a8fafff9901886c4de83fb715bef93dae15c3bde66 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 19 May 2016 21:11:22 +0000 Subject: [PATCH 11/13] - Split AkonadiCore, AkonadiAgentBase and AkonadiWidgets libraries to separate subpackages, as per the SLPP OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=39 --- akonadi-server.changes | 6 +++++ akonadi-server.spec | 52 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/akonadi-server.changes b/akonadi-server.changes index 1319f6c..e94c3ca 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 19 21:09:58 UTC 2016 - lbeltrame@kde.org + +- Split AkonadiCore, AkonadiAgentBase and AkonadiWidgets libraries + to separate subpackages, as per the SLPP + ------------------------------------------------------------------- Sat May 7 10:10:06 UTC 2016 - tittiatcoke@gmail.com diff --git a/akonadi-server.spec b/akonadi-server.spec index 2e68422..99c1098 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -78,16 +78,36 @@ Provides: libKF5AkonadiPrivate5 = %{version} This package contains the data files of Akonadi, the KDE PIM storage service. -%description -This package contains the data files of Akonadi, the KDE PIM storage -service. +%package -n libKF5AkonadiCore5 +Summary: Core Akonadi Server library +Group: System/Libraries +Requires: %{name} + +%description -n libKF5AkonadiCore5 +This package includes the core Akonadi library, the KDE PIM storage service. + +%package -n libKF5AkonadiAgentBase5 +Summary: Akonadi Agent base library +Group: System/Libraries +Requires: %{name} + +%description -n libKF5AkonadiAgentBase5 +This package includes the agent library for Akonadi, the KDE PIM storage service. + +%package -n libKF5AkonadiWidgets5 +Summary: Akonadi Agent base library +Group: System/Libraries +Requires: %{name} + +%description -n libKF5AkonadWidgets5 +This package provides the basic GUI widgets for Akonadi, the KDE PIM storage service. %package devel Summary: Akonadi Framework: Build Environment Group: Development/Libraries/X11 Requires: %{name} = %{version} -Obsoletes: libKF5AkonadiPrivate-devel < %{version} Obsoletes: akonadi-devel < %{version} +Obsoletes: libKF5AkonadiPrivate-devel < %{version} Provides: libKF5AkonadiPrivate-devel = %{version} Conflicts: libakonadiprotocolinternals-devel @@ -113,6 +133,15 @@ service. /sbin/ldconfig %{_kf5_bindir}/update-mime-database %{_kf5_sharedir}/mime &> /dev/null || : +%post -n libKF5AkonadiWidgets5 -p /sbin/ldconfig +%postun -n libKF5AkonadiWidgets5 -p /sbin/ldconfig + +%post -n libKF5AkonadiCore5 -p /sbin/ldconfig +%postun -n libKF5AkonadiCore5 -p /sbin/ldconfig + +%post -n libKF5AkonadiAgentBase5 -p /sbin/ldconfig +%postun -n libKF5AkonadiAgentBase5 -p /sbin/ldconfig + %files %defattr(-,root,root) %{_kf5_bindir}/asapcat @@ -133,14 +162,23 @@ service. %{_kf5_configkcfgdir}/resourcebase.kcfg %{_kf5_plugindir}/designer/ %{_libdir}/libKF5AkonadiPrivate.so.* -%{_libdir}/libKF5AkonadiCore.so.* -%{_libdir}/libKF5AkonadiAgentBase.so.* -%{_libdir}/libKF5AkonadiWidgets.so.* %{_libdir}/libKF5AkonadiXml.so.* %{_kf5_plugindir}/akonadi/ %{_datadir}/akonadi/ %{_datadir}/kf5/akonadi_knut_resource/ +%files -n libKF5AkonadiAgentBase5 +%defattr(-,root,root) +%{_libdir}/libKF5AkonadiAgentBase.so.* + +%files -n libKF5AkonadiCore5 +%defattr(-,root,root) +%{_libdir}/libKF5AkonadiCore.so.* + +%files -n libKF5AkonadiWidgets5 +%defattr(-,root,root) +%{_libdir}/libKF5AkonadiWidgets.so.* + %files devel %defattr(-,root,root) %{_kf5_bindir}/akonadi2xml From 7d1525a214222eb8ff5873e2b0c525e08e428577ab8acd8bee0def4f4165f89e Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 19 May 2016 21:16:09 +0000 Subject: [PATCH 12/13] Fix typo OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=40 --- akonadi-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akonadi-server.spec b/akonadi-server.spec index 99c1098..4eab999 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -99,7 +99,7 @@ Summary: Akonadi Agent base library Group: System/Libraries Requires: %{name} -%description -n libKF5AkonadWidgets5 +%description -n libKF5AkonadiWidgets5 This package provides the basic GUI widgets for Akonadi, the KDE PIM storage service. %package devel From 152e226da5bc21ece12735671f77f02769b7157ae0949f7ea4b5318ae0b3e9e4 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 19 May 2016 21:50:33 +0000 Subject: [PATCH 13/13] - Explicitly require the newly-split libs in the devel package OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=41 --- akonadi-server.changes | 5 +++++ akonadi-server.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/akonadi-server.changes b/akonadi-server.changes index e94c3ca..854d296 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 19 21:49:58 UTC 2016 - lbeltrame@kde.org + +- Explicitly require the newly-split libs in the devel package + ------------------------------------------------------------------- Thu May 19 21:09:58 UTC 2016 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index 4eab999..4eece92 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -106,6 +106,9 @@ This package provides the basic GUI widgets for Akonadi, the KDE PIM storage ser Summary: Akonadi Framework: Build Environment Group: Development/Libraries/X11 Requires: %{name} = %{version} +Requires: libKF5AkonadiAgentBase5 = %{version} +Requires: libKF5AkonadiCore5 = %{version} +Requires: libKF5AkonadiWidgets5 = %{version} Obsoletes: akonadi-devel < %{version} Obsoletes: libKF5AkonadiPrivate-devel < %{version} Provides: libKF5AkonadiPrivate-devel = %{version}