From d8063c7902c16974bc56602b3f29eb221021f301a6c8b7c0f58d52961c1e8247 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 31 Oct 2016 15:01:21 +0000 Subject: [PATCH] Accepting request 438042 from home:alarrosa:branches:KDE:Applications - Changed Requires to Recommends so Akonadi libraries don't require akonadi-server anymore and can be thus co-installable with akonadi-4.x . - Extracted libraries libKF5AkonadiPrivate5 and libKF5AkonadiXml5 from the akonadi-server package into new sub packages, so installing libraries don't require akonadi-server to be installed just because of the libraries. This fixes the zypper dup issue from openSUSE 13.2 to 42.2 OBS-URL: https://build.opensuse.org/request/show/438042 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=65 --- akonadi-server.changes | 11 ++++++++++ akonadi-server.spec | 48 +++++++++++++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/akonadi-server.changes b/akonadi-server.changes index ba77b0b..57ffda2 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Oct 31 10:43:08 UTC 2016 - alarrosa@suse.com + +- Changed Requires to Recommends so Akonadi libraries don't require + akonadi-server anymore and can be thus co-installable with + akonadi-4.x . +- Extracted libraries libKF5AkonadiPrivate5 and libKF5AkonadiXml5 + from the akonadi-server package into new sub packages, so installing + libraries don't require akonadi-server to be installed just + because of the libraries. + ------------------------------------------------------------------- Tue Oct 11 20:44:35 UTC 2016 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index fc9d6f9..b04c4c0 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -30,6 +30,7 @@ BuildRequires: boost-devel BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem +BuildRequires: libQt5Sql-private-headers-devel BuildRequires: libxml2 BuildRequires: libxslt BuildRequires: libxslt-devel @@ -55,7 +56,6 @@ BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: libQt5Sql-private-headers-devel BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) @@ -72,8 +72,6 @@ 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 @@ -82,7 +80,7 @@ service. %package -n libKF5AkonadiCore5 Summary: Core Akonadi Server library Group: System/Libraries -Requires: %{name} +Recommends: %{name} %description -n libKF5AkonadiCore5 This package includes the core Akonadi library, the KDE PIM storage service. @@ -90,7 +88,7 @@ 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} +Recommends: %{name} %description -n libKF5AkonadiAgentBase5 This package includes the agent library for Akonadi, the KDE PIM storage service. @@ -98,11 +96,29 @@ 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} +Recommends: %{name} %description -n libKF5AkonadiWidgets5 This package provides the basic GUI widgets for Akonadi, the KDE PIM storage service. +%package -n libKF5AkonadiPrivate5 +Summary: Akonadi Private Server library +Group: System/Libraries +Recommends: %{name} +Obsoletes: libKF5AkonadiPrivate5 < %{version} +Provides: libKF5AkonadiPrivate5 = %{version} + +%description -n libKF5AkonadiPrivate5 +This package includes the Private Akonadi library for Akonadi, the KDE PIM storage service. + +%package -n libKF5AkonadiXml5 +Summary: Akonadi Xml library +Group: System/Libraries +Recommends: %{name} + +%description -n libKF5AkonadiXml5 +This package includes the Akonadi Xml library for Akonadi, the KDE PIM storage service. + %package devel Summary: Akonadi Framework: Build Environment Group: Development/Libraries/X11 @@ -114,11 +130,11 @@ Requires: kitemmodels-devel Requires: kjobwidgets-devel Requires: kservice-devel Requires: kxmlgui-devel -Requires: pkgconfig(Qt5Network) -Requires: solid-devel Requires: libKF5AkonadiAgentBase5 = %{version} Requires: libKF5AkonadiCore5 = %{version} Requires: libKF5AkonadiWidgets5 = %{version} +Requires: solid-devel +Requires: pkgconfig(Qt5Network) Obsoletes: akonadi-devel < %{version} Obsoletes: libKF5AkonadiPrivate-devel < %{version} Provides: libKF5AkonadiPrivate-devel = %{version} @@ -155,6 +171,12 @@ service. %post -n libKF5AkonadiAgentBase5 -p /sbin/ldconfig %postun -n libKF5AkonadiAgentBase5 -p /sbin/ldconfig +%post -n libKF5AkonadiPrivate5 -p /sbin/ldconfig +%postun -n libKF5AkonadiPrivate5 -p /sbin/ldconfig + +%post -n libKF5AkonadiXml5 -p /sbin/ldconfig +%postun -n libKF5AkonadiXml5 -p /sbin/ldconfig + %files %defattr(-,root,root) %{_kf5_bindir}/asapcat @@ -174,8 +196,6 @@ service. %dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/resourcebase.kcfg %{_kf5_plugindir}/designer/ -%{_libdir}/libKF5AkonadiPrivate.so.* -%{_libdir}/libKF5AkonadiXml.so.* %{_kf5_plugindir}/akonadi/ %{_datadir}/akonadi/ %{_datadir}/kf5/akonadi_knut_resource/ @@ -192,6 +212,14 @@ service. %defattr(-,root,root) %{_libdir}/libKF5AkonadiWidgets.so.* +%files -n libKF5AkonadiPrivate5 +%defattr(-,root,root) +%{_libdir}/libKF5AkonadiPrivate.so.* + +%files -n libKF5AkonadiXml5 +%defattr(-,root,root) +%{_libdir}/libKF5AkonadiXml.so.* + %files devel %defattr(-,root,root) %{_kf5_bindir}/akonadi2xml