pool/akonadi-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=4
This commit is contained in:
Christophe Giboudeaux 2015-08-24 11:05:11 +00:00 committed by Git OBS Bridge
parent 4130a9c786
commit 1c7f8e69e7
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
akonadi-server.changes
View File

@ -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 Wed Aug 19 19:42:26 UTC 2015 - cgiboudeaux@gmx.com

24
akonadi-server.spec
View File

@ -62,7 +62,7 @@ Summary: PIM Storage Service: Build Environment
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Requires: libKF5AkonadiPrivate5 = %{version} Requires: libKF5AkonadiPrivate5 = %{version}
Requires: %{name} = %{version} Requires: %{name} = %{version}
Conflicts: libakonadiprotocolinterals-devel Conflicts: libakonadiprotocolinternals-devel
%description -n libKF5AkonadiPrivate-devel %description -n libKF5AkonadiPrivate-devel
This package contains development files of Akonadi, the KDE PIM storage This package contains development files of Akonadi, the KDE PIM storage
@ -103,27 +103,29 @@ service.
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_kf5_bindir}/asapcat %doc lgpl-license AUTHORS README*
%{_kf5_bindir}/akonadi*
%dir %{_kf5_sysconfdir}/xdg/akonadi %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 %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
%{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf
%{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %{_kf5_bindir}/akonadi*
%{_kf5_sharedir}/mime/packages/akonadi-mime.xml %{_kf5_bindir}/asapcat
%{_kf5_plugindir}/sqldrivers/libqsqlite3.so %{_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 %files -n libKF5AkonadiPrivate-devel
%defattr(-,root,root) %defattr(-,root,root)
%{_kf5_includedir}/akonadi/ %doc lgpl-license
%dir %{_kf5_libdir}/cmake %dir %{_kf5_libdir}/cmake
%{_kf5_libdir}/cmake/KF5AkonadiServer %{_kf5_includedir}/akonadi/
%{_kf5_libdir}/cmake/KF5AkonadiServer/
%{_kf5_libdir}/libKF5AkonadiPrivate.so %{_kf5_libdir}/libKF5AkonadiPrivate.so
%{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
%files -n libKF5AkonadiPrivate5 %files -n libKF5AkonadiPrivate5
%defattr(-,root,root) %defattr(-,root,root)
%doc lgpl-license
%{_kf5_libdir}/libKF5AkonadiPrivate.so.* %{_kf5_libdir}/libKF5AkonadiPrivate.so.*
%changelog %changelog