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

Accepting request 770086 from home:StefanBruens:branches:openSUSE:Factory

Browse Source 
- Align build dependencies with the ones from CMakeLists.txt,
  same for -devel and KF5AkonadiConfig.cmake.
- Remove libxslt-devel, only xstlproc (libxml2-tools) is required.
- No longer recommend -lang: supplements are in use

OBS-URL: https://build.opensuse.org/request/show/770086
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=221
This commit is contained in:
Luca Beltrame 2020-02-04 21:34:53 +00:00 committed by Git OBS Bridge
parent 938e7ddc67
commit b7f1ec372e
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
akonadi-server.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Feb 4 18:31:03 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Align build dependencies with the ones from CMakeLists.txt,
same for -devel and KF5AkonadiConfig.cmake.
- Remove libxslt-devel, only xstlproc (libxml2-tools) is required.
- No longer recommend -lang: supplements are in use
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 7 10:08:48 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr> Tue Jan 7 10:08:48 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

27
akonadi-server.spec
View File

@ -17,7 +17,7 @@
%define rname akonadi %define rname akonadi
%define kf5_version 5.60.0 %define kf5_version 5.63.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang %bcond_without lang
@ -34,15 +34,13 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%
Source2: applications.keyring Source2: applications.keyring
%endif %endif
Source99: akonadi-server-rpmlintrc Source99: akonadi-server-rpmlintrc
BuildRequires: cmake >= 3.0.0 BuildRequires: cmake >= 3.5.0
BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: libQt5Sql-private-headers-devel BuildRequires: libQt5Sql-private-headers-devel
BuildRequires: libboost_graph-devel BuildRequires: libboost_graph-devel
BuildRequires: libboost_headers-devel BuildRequires: libboost_headers-devel
BuildRequires: libxml2 BuildRequires: libxml2-tools
BuildRequires: libxslt
BuildRequires: libxslt-devel
BuildRequires: libxslt-tools BuildRequires: libxslt-tools
BuildRequires: mariadb BuildRequires: mariadb
BuildRequires: postgresql-devel BuildRequires: postgresql-devel
@ -51,20 +49,21 @@ BuildRequires: sqlite3-devel
BuildRequires: cmake(KAccounts) BuildRequires: cmake(KAccounts)
BuildRequires: cmake(KF5Completion) BuildRequires: cmake(KF5Completion)
BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5ConfigWidgets)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5Crash)
BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5DesignerPlugin)
BuildRequires: cmake(KF5GuiAddons)
BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5ItemModels) BuildRequires: cmake(KF5ItemModels)
BuildRequires: cmake(KF5ItemViews) BuildRequires: cmake(KF5ItemViews)
BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF5XmlGui)
BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Designer) BuildRequires: cmake(Qt5Designer)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Sql)
BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Test)
@ -80,7 +79,6 @@ Provides: akonadi5 = %{version}
# Needed for users of unstable repositories # Needed for users of unstable repositories
Obsoletes: akonadi < %{version} Obsoletes: akonadi < %{version}
Obsoletes: akonadi-runtime < %{version} Obsoletes: akonadi-runtime < %{version}
Recommends: %{name}-lang
# FIXME: Check if it's worth it # FIXME: Check if it's worth it
Recommends: kaccounts-integration Recommends: kaccounts-integration
Recommends: kaccounts-providers Recommends: kaccounts-providers
@ -147,13 +145,16 @@ Requires: libKF5AkonadiCore5 = %{version}
Requires: libKF5AkonadiWidgets5 = %{version} Requires: libKF5AkonadiWidgets5 = %{version}
Requires: libboost_headers-devel Requires: libboost_headers-devel
Requires: cmake(KF5Completion) Requires: cmake(KF5Completion)
Requires: cmake(KF5Config)
Requires: cmake(KF5ConfigWidgets)
Requires: cmake(KF5CoreAddons)
Requires: cmake(KF5ItemModels) Requires: cmake(KF5ItemModels)
Requires: cmake(KF5JobWidgets)
Requires: cmake(KF5KDELibs4Support)
Requires: cmake(KF5Service)
Requires: cmake(KF5Solid)
Requires: cmake(KF5XmlGui) Requires: cmake(KF5XmlGui)
Requires: cmake(Qt5Core)
Requires: cmake(Qt5DBus)
Requires: cmake(Qt5Network) Requires: cmake(Qt5Network)
Requires: cmake(Qt5Widgets)
Requires: cmake(Qt5Xml)
Conflicts: libakonadiprotocolinternals-devel Conflicts: libakonadiprotocolinternals-devel
Obsoletes: akonadi-devel < %{version} Obsoletes: akonadi-devel < %{version}
Obsoletes: libKF5AkonadiPrivate-devel < %{version} Obsoletes: libKF5AkonadiPrivate-devel < %{version}