Request 2148 (accepted)

Overview

Request 2148 (accepted)

Merging from Kontact:4.13:Development

Created by mollekopf over 6 years ago
In state accepted

Submit akonadi

Submit package Kontact:4.13:Development / akonadi to package Kontact:4.13 / akonadi

akonadi.spec Changed

@@ -10,9 +10,12 @@
 %define cmake_pkg cmake
 %endif
 
+%define patch_version 17
+%define actual_version 1.12.42.%{patch_version}
+
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.12.42.16
+Version: 99.12.42.17
 # Magic provides since this is what ends up in the pkgconfig
 Provides: %{name}%{?_isa} = %{version}
 Release: 1%{?dist}
@@ -20,10 +23,12 @@
 License: LGPLv2+
 URL:     http://community.kde.org/KDE_PIM/Akonadi 
 
-Source0: %{name}_%{version}.orig.tar.gz
+Source0: %{name}_%{actual_version}.orig.tar.gz
 
 ## mysql config
 Source10: akonadiserverrc.mysql
+Source11: akonadi_shutdown.service
+Source12: akonadi_shutdown.preset
 
 ## upstreamable patches
 
@@ -43,17 +48,21 @@
 BuildRequires: dbus-x11 xorg-x11-server-Xvfb
 # backends, used at buildtime to query known locations of server binaries
 # FIXME/TODO: set these via cmake directives, avoids needless buildroot items
-%if 0%{?rhel} == 7
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 25
 BuildRequires: mariadb-server
 %else
 BuildRequires: mysql-server
 %endif
 BuildRequires: postgresql-server
+BuildRequires: systemd
 
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 Requires(postun): /sbin/ldconfig
 
+#These packages are not coinstallable and will clash latest at runtime on dbus.
+Conflicts: kf5-akonadi-server
+
 %description
 %{summary}.
 
@@ -69,7 +78,7 @@
 Obsoletes: akonadi < %{version}
 Provides: akonadi = %{version}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-%if 0%{?rhel} == 7
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 25
 Requires: mariadb-server
 %else
 Requires: mysql-server
@@ -87,7 +96,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{actual_version}
 
 
 %build
@@ -109,6 +118,8 @@
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 install -p -m644 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc.mysql
+install -p -m644 -D %{SOURCE11} %{buildroot}%{_libdir}/systemd/user/akonadi_shutdown.service
+install -p -m644 -D %{SOURCE12} %{buildroot}%{_libdir}/systemd/user-preset/akonadi_shutdown.service
 
 mkdir -p %{buildroot}%{_datadir}/akonadi/agents
 
@@ -148,6 +159,8 @@
 
 %post -p /sbin/ldconfig
 
+%systemd_user_post akonadi_shutdown.service
+
 %posttrans
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
@@ -174,6 +187,8 @@
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service
 %{_datadir}/mime/packages/akonadi-mime.xml
 %{_datadir}/akonadi/
+%{_libdir}/systemd/user/akonadi_shutdown.service
+%{_libdir}/systemd/user-preset/akonadi_shutdown.service
 
 %files devel
 %{_bindir}/asapcat