Request 1803 (superseded)

This request is superseded by request 1804 (Show diff)

Overview

Request 1803 (superseded)

New release 1.12.42.14

Created by mollekopf over 7 years ago
In state superseded
Supersedes 1799
Superseded by 1804

Submit akonadi

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

akonadi.spec Changed

@@ -10,12 +10,9 @@
 %define cmake_pkg cmake
 %endif
 
-%define patch_version 17
-%define actual_version 1.12.42.%{patch_version}
-
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 99.12.42.17
+Version: 1.12.42.13
 # Magic provides since this is what ends up in the pkgconfig
 Provides: %{name}%{?_isa} = %{version}
 Release: 1%{?dist}
@@ -23,12 +20,10 @@
 License: LGPLv2+
 URL:     http://community.kde.org/KDE_PIM/Akonadi 
 
-Source0: %{name}_%{actual_version}.orig.tar.gz
+Source0: %{name}_%{version}.orig.tar.gz
 
 ## mysql config
 Source10: akonadiserverrc.mysql
-Source11: akonadi_shutdown.service
-Source12: akonadi_shutdown.preset
 
 ## upstreamable patches
 
@@ -48,21 +43,17 @@
 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 || 0%{?fedora} >= 25
+%if 0%{?rhel} == 7
 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}.
 
@@ -78,7 +69,7 @@
 Obsoletes: akonadi < %{version}
 Provides: akonadi = %{version}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 25
+%if 0%{?rhel} == 7
 Requires: mariadb-server
 %else
 Requires: mysql-server
@@ -96,7 +87,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{actual_version}
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -118,8 +109,6 @@
 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
 
@@ -159,8 +148,6 @@
 
 %post -p /sbin/ldconfig
 
-%systemd_user_post akonadi_shutdown.service
-
 %posttrans
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
@@ -187,8 +174,6 @@
 %{_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
@@ -221,12 +206,6 @@
 
 
 %changelog
-* Mon Feb 13 2017 Christian Mollekopf (Kolab Systems) <mollekopf@kolabsys.com> - 1.12.42.16-1
-- New upstream release 1.12.42.16
-
-* Mon Dec 05 2016 Sandro Knauß (Kolab Systems) <knauss@kolabsys.com> - 1.12.42.15-1
-- New upstream release 1.12.42.15
-
 * Thu Oct 20 2016 Christian Mollekopf (Kolab Systems) <mollekopf@kolabsys.com> - 1.12.42.14-1
 - New upstream release 1.12.42.14

akonadi.dsc Changed

@@ -2,7 +2,7 @@
 Source: akonadi
 Binary: akonadi-server, libakonadiprotocolinternals1, libakonadi-dev, akonadi-backend-mysql, akonadi-backend-postgresql, akonadi-dbg
 Architecture: any all
-Version: 1.12.42.17-0~kolab1
+Version: 1.12.42.14-0~kolab1
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Sune Vuorela <debian@pusling.com>, Modestas Vainius <modax@debian.org>, Fathi Boudra <fabo@debian.org>, Maximiliano Curia <maxy@debian.org>
 Homepage: http://pim.kde.org/akonadi
@@ -10,8 +10,7 @@
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-req/akonadi.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-req/akonadi.git
 Testsuite: autopkgtest
-Testsuite-Triggers: build-essential, dbus-x11, dh-acc, exuberant-ctags, libxml2-utils, xauth, xvfb
-Build-Depends: automoc, cmake (>= 2.8.8), debhelper (>= 8), libboost-program-options-dev, libdbus-1-dev, libicu-dev, libmysqlclient-dev, libqt4-dev (>= 4:4.8.0), libsoprano-dev (>= 2.7.5), libxslt-dev, mysql-server-core | mysql-server-core-5.7 | default-mysql-server-core, pkg-kde-tools (>= 0.12), shared-mime-info (>= 0.20), xsltproc
+Build-Depends: automoc, cmake (>= 2.8.8), debhelper (>= 8), libboost-program-options-dev, libdbus-1-dev, libicu-dev, libmysqlclient-dev, libqt4-dev (>= 4:4.8.0), libsoprano-dev (>= 2.7.5), libxslt-dev, mysql-server-core, pkg-kde-tools (>= 0.12), shared-mime-info (>= 0.20), xsltproc
 Package-List:
  akonadi-backend-mysql deb misc extra arch=all
  akonadi-backend-postgresql deb misc extra arch=all
@@ -20,5 +19,5 @@
  libakonadi-dev deb libdevel extra arch=any
  libakonadiprotocolinternals1 deb libs extra arch=any
 Files:
- 00000000000000000000000000000000 0 akonadi-1.12.42.16.orig.tar.gz
+ 00000000000000000000000000000000 0 akonadi-1.12.42.5.orig.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz