Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kraft for openSUSE:Factory checked
in at 2024-03-29 13:10:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kraft (Old)
and /work/SRC/openSUSE:Factory/.kraft.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kraft"
Fri Mar 29 13:10:39 2024 rev:23 rq:1163453 version:1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/kraft/kraft.changes 2024-03-09
20:55:20.872045700 +0100
+++ /work/SRC/openSUSE:Factory/.kraft.new.1905/kraft.changes 2024-03-29
13:13:39.589087977 +0100
@@ -1,0 +2,6 @@
+Mon Mar 11 23:43:28 UTC 2024 - Christophe Marin <christo...@krop.fr>
+
+- Build without Akonadi integration for repositories that now
+ provide the kdepim 6 libraries
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kraft.spec ++++++
--- /var/tmp/diff_new_pack.TJLSe8/_old 2024-03-29 13:13:40.113107227 +0100
+++ /var/tmp/diff_new_pack.TJLSe8/_new 2024-03-29 13:13:40.117107373 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kraft
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2007-2011 Klaas Freitag <frei...@kde.org>
#
# All modifications and additions to the file contributed by third parties
@@ -17,7 +17,15 @@
#
-%bcond_without akonadi
+# Build without akonadi integration on repositories providing KDE PIM 6
libraries
+%if 0%{?suse_version} > 1500 || "%{_repository}" ==
"KDE_Applications_openSUSE_Leap_15.5" || "%{_repository}" ==
"KDE_Applications_openSUSE_Leap_15.6"
+%define with_akonadi 0
+%else
+%define with_akonadi 1
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150600
+%define akonadi_legacy 1
+%endif
+%endif
%bcond_with qpdfview
Name: kraft
Version: 1.1
@@ -34,7 +42,6 @@
BuildRequires: cmake(Grantlee5)
BuildRequires: cmake(KF5Codecs)
BuildRequires: cmake(KF5Config)
-BuildRequires: cmake(KF5ContactEditor)
BuildRequires: cmake(KF5Contacts)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(Qt5Core) >= 5.5.0
@@ -55,14 +62,14 @@
# PATCH-FEATURE-UPSTREAM use_qpdfview.path Open PDFs in qpdfview in appimages
Patch0: use_qpdfview.patch
%endif
-%if %{with akonadi}
-%if 0%{?suse_version} > 1500 || (0%{?suse_version} == 1500 && 0%{?sle_version}
> 150500)
-BuildRequires: cmake(KPim5AkonadiContact)
-%else
+%if %{with_akonadi}
+BuildRequires: cmake(KF5ContactEditor)
+%if 0%{?akonadi_legacy}
BuildRequires: cmake(KF5AkonadiContact)
+%else
+BuildRequires: cmake(KPim5AkonadiContact)
%endif
%endif
-# PATCH-FIX-UPSTREAM fixakonadi.patch Use new Akonadi Prefix
%description
Kraft is KDE software to help to create and manage office documents such as
@@ -87,27 +94,23 @@
[ -f .tag ] && echo ".tag file exists in tarball." || echo "%{version}" > .tag
-%if 0%{?suse_version} > 1500 || (0%{?suse_version} == 1500 && 0%{?sle_version}
> 150500)
-%cmake_kf5 -d build
-%else
-%cmake_kf5 -d build -- -DAKONADI_LEGACY_BUILD=ON
-%endif
+%cmake_kf5 -d build %{?akonadi_legacy:-- -DAKONADI_LEGACY_BUILD=ON}
+
%cmake_build
%install
%kf5_makeinstall -C build
chmod 755 %{buildroot}%{_datadir}/kraft/tools/erml2pdf.py
-%if %{?suse_version:1}0
+%if 0%{?suse_version}
%suse_update_desktop_file -G kraft de.volle_kraft_voraus.kraft Office Finance
%endif
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
%{_bindir}/kraft
-%if %{with akonadi}
+%if %{with_akonadi}
%{_bindir}/findcontact
%endif
%{_datadir}/applications/de.volle_kraft_voraus.kraft.desktop
