From 1c7f8e69e7c57773a39026f4d0ce9895e6e9f5f44cc4e636f8f8c7f3d8d0ffcf Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 24 Aug 2015 11:05:11 +0000 Subject: [PATCH] fix conflicts OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=4 --- akonadi-server.changes | 6 ++++++ akonadi-server.spec | 24 +++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/akonadi-server.changes b/akonadi-server.changes index a522127..3bc8c5e 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 24 11:04:45 UTC 2015 - cgiboudeaux@gmx.com + +- Make libKF5AkonadiPrivate-devel conflict with + libakonadiprotocolinternals-devel as expected. + ------------------------------------------------------------------- Wed Aug 19 19:42:26 UTC 2015 - cgiboudeaux@gmx.com diff --git a/akonadi-server.spec b/akonadi-server.spec index ba16e0f..5fbdb60 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -62,7 +62,7 @@ Summary: PIM Storage Service: Build Environment Group: Development/Libraries/X11 Requires: libKF5AkonadiPrivate5 = %{version} Requires: %{name} = %{version} -Conflicts: libakonadiprotocolinterals-devel +Conflicts: libakonadiprotocolinternals-devel %description -n libKF5AkonadiPrivate-devel This package contains development files of Akonadi, the KDE PIM storage @@ -103,27 +103,29 @@ service. %files %defattr(-,root,root) -%{_kf5_bindir}/asapcat -%{_kf5_bindir}/akonadi* +%doc lgpl-license AUTHORS README* %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}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml -%{_kf5_sharedir}/mime/packages/akonadi-mime.xml +%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_sysconfdir}/xdg/akonadi.categories %files -n libKF5AkonadiPrivate-devel %defattr(-,root,root) -%{_kf5_includedir}/akonadi/ +%doc lgpl-license %dir %{_kf5_libdir}/cmake -%{_kf5_libdir}/cmake/KF5AkonadiServer +%{_kf5_includedir}/akonadi/ +%{_kf5_libdir}/cmake/KF5AkonadiServer/ %{_kf5_libdir}/libKF5AkonadiPrivate.so +%{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %files -n libKF5AkonadiPrivate5 %defattr(-,root,root) +%doc lgpl-license %{_kf5_libdir}/libKF5AkonadiPrivate.so.* %changelog