From 081e3a305c7ce18a6a63af5953f0f2373aeb5cd8e6b9d50c259553a1ac8167b1 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 27 Aug 2020 11:35:28 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kreport?expand=0&rev=36 --- kreport.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kreport.spec b/kreport.spec index 5c86822..52a2afa 100644 --- a/kreport.spec +++ b/kreport.spec @@ -1,7 +1,7 @@ # # spec file for package kreport # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 772091e59bb38c85aac7e5750a083840ff190d7b241841a8ce205305766c91a5 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 27 Aug 2020 12:50:07 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kreport?expand=0&rev=37 --- kreport.changes | 5 +++++ kreport.spec | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kreport.changes b/kreport.changes index 024f6ac..5f72d56 100644 --- a/kreport.changes +++ b/kreport.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 27 12:50:01 UTC 2020 - Christophe Giboudeaux + +- Spec cleanup + ------------------------------------------------------------------- Wed Jun 17 07:59:16 UTC 2020 - Wolfgang Bauer diff --git a/kreport.spec b/kreport.spec index 52a2afa..578064f 100644 --- a/kreport.spec +++ b/kreport.spec @@ -68,12 +68,11 @@ Development package for the Report Creation and Generation framework %lang_package %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build %cmake_kf5 -d build -%make_jobs +%cmake_build %install %kf5_makeinstall -C build @@ -91,16 +90,15 @@ Development package for the Report Creation and Generation framework %files %{_datadir}/kreport3/ -%{_kf5_servicetypesdir}/kreport_elementplugin.desktop %{_kf5_plugindir}/kreport3/ +%{_kf5_servicetypesdir}/kreport_elementplugin.desktop %files devel %license COPYING* %{_includedir}/KReport3/ +%{_kf5_mkspecsdir}/qt_KReport3.pri %{_libdir}/cmake/KReport3/ %{_libdir}/libKReport3.so -#%%{_libdir}/pkgconfig/KReport3.pc -%{_kf5_mkspecsdir}/qt_KReport3.pri %files lang -f %{name}.lang From 5619ed139bbefa97b01f143fab23a5582d359b58c9dff18a1011e8f5646e889c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 20 Apr 2021 13:52:19 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kreport?expand=0&rev=38 --- kreport.changes | 5 +++++ kreport.spec | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/kreport.changes b/kreport.changes index 5f72d56..f37745c 100644 --- a/kreport.changes +++ b/kreport.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 20 13:52:12 UTC 2021 - Christophe Giboudeaux + +- Spec cleanup + ------------------------------------------------------------------- Thu Aug 27 12:50:01 UTC 2020 - Christophe Giboudeaux diff --git a/kreport.spec b/kreport.spec index 578064f..4fa3921 100644 --- a/kreport.spec +++ b/kreport.spec @@ -1,7 +1,7 @@ # # spec file for package kreport # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,13 +28,13 @@ Source0: https://download.kde.org/stable/%{name}/src/%{name}-%{version}.t # PATCH-FIX-UPSTREAM Patch0: Fix-kexi-build-with-GCC-10.patch BuildRequires: extra-cmake-modules -BuildRequires: kproperty-devel BuildRequires: python-base BuildRequires: update-desktop-files BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KPropertyCore) BuildRequires: cmake(Marble) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5LinguistTools) @@ -59,7 +59,7 @@ The main library for the Report creation and generation framework %package devel Summary: Development package for KReport Group: Development/Libraries/KDE -Requires: kproperty-devel +Requires: cmake(KPropertyCore) Requires: libKReport3-%{sover} = %{version} %description devel @@ -75,11 +75,11 @@ Development package for the Report Creation and Generation framework %cmake_build %install - %kf5_makeinstall -C build - %find_lang %{name} %{name}.lang --all-name --with-qt +%kf5_makeinstall -C build +%find_lang %{name} %{name}.lang --all-name --with-qt - # The pkgconfig files contain incorrect stuff - rm -f %{buildroot}%{_libdir}/pkgconfig/KReport3.pc +# The pkgconfig files contain incorrect stuff +rm %{buildroot}%{_libdir}/pkgconfig/KReport3.pc %post -n libKReport3-%{sover} -p /sbin/ldconfig %postun -n libKReport3-%{sover} -p /sbin/ldconfig @@ -89,16 +89,16 @@ Development package for the Report Creation and Generation framework %{_libdir}/libKReport3.so.* %files -%{_datadir}/kreport3/ %{_kf5_plugindir}/kreport3/ %{_kf5_servicetypesdir}/kreport_elementplugin.desktop +%{_kf5_sharedir}/kreport3/ %files devel %license COPYING* %{_includedir}/KReport3/ +%{_kf5_cmakedir}/KReport3/ +%{_kf5_libdir}/libKReport3.so %{_kf5_mkspecsdir}/qt_KReport3.pri -%{_libdir}/cmake/KReport3/ -%{_libdir}/libKReport3.so %files lang -f %{name}.lang From f3851e072ed2193046233ecafcba85ae50f79341526f27863cd659b159665cbd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 28 Jun 2021 07:13:41 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kreport?expand=0&rev=39 --- kreport.changes | 5 +++++ kreport.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kreport.changes b/kreport.changes index f37745c..d6564fe 100644 --- a/kreport.changes +++ b/kreport.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 28 07:13:37 UTC 2021 - Christophe Giboudeaux + +- Remove the optional QtWebKit build dependency. + ------------------------------------------------------------------- Tue Apr 20 13:52:12 UTC 2021 - Christophe Giboudeaux diff --git a/kreport.spec b/kreport.spec index 4fa3921..b636f89 100644 --- a/kreport.spec +++ b/kreport.spec @@ -40,7 +40,6 @@ BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5WebKitWidgets) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) Recommends: %{name}-lang From 88fd7790e7f3bfdb7d978e52c389d4b274d290a8d04381045b8831b8c95f96fa Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 28 Jun 2021 19:27:23 +0000 Subject: [PATCH 5/5] Accepting request 902865 from home:wolfi323:branches:KDE:Extra - Add Requires: cmake(Qt5Qml) to the devel package to fix kexi's build on ppc OBS-URL: https://build.opensuse.org/request/show/902865 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kreport?expand=0&rev=40 --- kreport.changes | 6 ++++++ kreport.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/kreport.changes b/kreport.changes index d6564fe..2457040 100644 --- a/kreport.changes +++ b/kreport.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 28 14:47:16 UTC 2021 - Wolfgang Bauer + +- Add Requires: cmake(Qt5Qml) to the devel package to fix kexi's + build on ppc + ------------------------------------------------------------------- Mon Jun 28 07:13:37 UTC 2021 - Christophe Giboudeaux diff --git a/kreport.spec b/kreport.spec index b636f89..96aa324 100644 --- a/kreport.spec +++ b/kreport.spec @@ -59,6 +59,7 @@ The main library for the Report creation and generation framework Summary: Development package for KReport Group: Development/Libraries/KDE Requires: cmake(KPropertyCore) +Requires: cmake(Qt5Qml) Requires: libKReport3-%{sover} = %{version} %description devel