Accepting request 396896 from KDE:Applications

- Explicitly require the newly-split libs in the devel package

- Split AkonadiCore, AkonadiAgentBase and AkonadiWidgets libraries
  to separate subpackages, as per the SLPP

OBS-URL: https://build.opensuse.org/request/show/396896
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akonadi-server?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2016-05-31 10:22:31 +00:00 committed by Git OBS Bridge
commit e606b60a66
4 changed files with 158 additions and 40 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e8d29e2e14a51b7445f2d634b3dfefcfb124532a5f7c575a9b2a48e9ce61f9f
size 287728

3
akonadi-16.04.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e1b16406bde573dcb9e482d580268dd358706c7c8c1b336170c5e367f2c66c6
size 1021384

View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
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
- Split AkonadiCore, AkonadiAgentBase and AkonadiWidgets libraries
to separate subpackages, as per the SLPP
-------------------------------------------------------------------
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
- Move akonadi2xml to devel package
-------------------------------------------------------------------
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
- 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
- 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

View File

@ -17,7 +17,7 @@
Name: akonadi-server
Version: 15.12.3
Version: 16.04.1
Release: 0
%define rname akonadi
Summary: PIM Storage Service
@ -32,10 +32,24 @@ BuildRequires: extra-cmake-modules
BuildRequires: kf5-filesystem
BuildRequires: libxml2
BuildRequires: libxslt
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)
@ -47,7 +61,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
@ -56,34 +69,55 @@ 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
%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 libKF5AkonadiWidgets5
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}
Requires: libKF5AkonadiPrivate5 = %{version}
%if 0%{?suse_version} > 1320
Obsoletes: libakonadiprotocolinternals-devel < %{version}
%else
Requires: libKF5AkonadiAgentBase5 = %{version}
Requires: libKF5AkonadiCore5 = %{version}
Requires: libKF5AkonadiWidgets5 = %{version}
Obsoletes: akonadi-devel < %{version}
Obsoletes: libKF5AkonadiPrivate-devel < %{version}
Provides: libKF5AkonadiPrivate-devel = %{version}
Conflicts: libakonadiprotocolinternals-devel
%endif
%description -n libKF5AkonadiPrivate-devel
%description 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
This package contains the data files of Akonadi, the KDE PIM storage
service.
%prep
%setup -q -n %{rname}-%{version}
@ -102,35 +136,72 @@ service.
/sbin/ldconfig
%{_kf5_bindir}/update-mime-database %{_kf5_sharedir}/mime &> /dev/null || :
%post -n libKF5AkonadiPrivate5 -p /sbin/ldconfig
%post -n libKF5AkonadiWidgets5 -p /sbin/ldconfig
%postun -n libKF5AkonadiWidgets5 -p /sbin/ldconfig
%postun -n libKF5AkonadiPrivate5 -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)
%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_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
%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
%{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
%{_kf5_sharedir}/mime/packages/akonadi-mime.xml
%{_kf5_sysconfdir}/xdg/akonadi.categories
%{_kf5_plugindir}/sqldrivers/libqsqlite3.so
%{_datadir}/kf5/akonadi/
%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/
%files -n libKF5AkonadiPrivate-devel
%files -n libKF5AkonadiAgentBase5
%defattr(-,root,root)
%doc lgpl-license
%dir %{_kf5_libdir}/cmake
%{_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
%{_kf5_includedir}/akonadi/
%{_kf5_libdir}/cmake/KF5AkonadiServer/
%{_kf5_libdir}/libKF5AkonadiPrivate.so
%{_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
%{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
%files -n libKF5AkonadiPrivate5
%defattr(-,root,root)
%doc lgpl-license
%{_kf5_libdir}/libKF5AkonadiPrivate.so.*
%{_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