Accepting request 902879 from KDE:Extra

- Add Requires: cmake(Qt5Qml) to the devel package to fix kexi's
  build on ppc (forwarded request 902865 from wolfi323)

OBS-URL: https://build.opensuse.org/request/show/902879
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kreport?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2021-06-29 20:42:52 +00:00 committed by Git OBS Bridge
commit 113f3d9799
2 changed files with 35 additions and 16 deletions

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Jun 28 14:47:16 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
- 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 <christophe@krop.fr>
- Remove the optional QtWebKit build dependency.
-------------------------------------------------------------------
Tue Apr 20 13:52:12 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Spec cleanup
-------------------------------------------------------------------
Thu Aug 27 12:50:01 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
- Spec cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 17 07:59:16 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at> Wed Jun 17 07:59:16 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>

View File

@ -1,7 +1,7 @@
# #
# spec file for package kreport # spec file for package kreport
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,19 +28,18 @@ Source0: https://download.kde.org/stable/%{name}/src/%{name}-%{version}.t
# PATCH-FIX-UPSTREAM # PATCH-FIX-UPSTREAM
Patch0: Fix-kexi-build-with-GCC-10.patch Patch0: Fix-kexi-build-with-GCC-10.patch
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: kproperty-devel
BuildRequires: python-base BuildRequires: python-base
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5GuiAddons)
BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KPropertyCore)
BuildRequires: cmake(Marble) BuildRequires: cmake(Marble)
BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5PrintSupport)
BuildRequires: cmake(Qt5Qml) BuildRequires: cmake(Qt5Qml)
BuildRequires: cmake(Qt5WebKitWidgets)
BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5Xml) BuildRequires: cmake(Qt5Xml)
Recommends: %{name}-lang Recommends: %{name}-lang
@ -59,7 +58,8 @@ The main library for the Report creation and generation framework
%package devel %package devel
Summary: Development package for KReport Summary: Development package for KReport
Group: Development/Libraries/KDE Group: Development/Libraries/KDE
Requires: kproperty-devel Requires: cmake(KPropertyCore)
Requires: cmake(Qt5Qml)
Requires: libKReport3-%{sover} = %{version} Requires: libKReport3-%{sover} = %{version}
%description devel %description devel
@ -68,19 +68,18 @@ Development package for the Report Creation and Generation framework
%lang_package %lang_package
%prep %prep
%setup -q %autosetup -p1
%autopatch -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build
%make_jobs %cmake_build
%install %install
%kf5_makeinstall -C build %kf5_makeinstall -C build
%find_lang %{name} %{name}.lang --all-name --with-qt %find_lang %{name} %{name}.lang --all-name --with-qt
# The pkgconfig files contain incorrect stuff # The pkgconfig files contain incorrect stuff
rm -f %{buildroot}%{_libdir}/pkgconfig/KReport3.pc rm %{buildroot}%{_libdir}/pkgconfig/KReport3.pc
%post -n libKReport3-%{sover} -p /sbin/ldconfig %post -n libKReport3-%{sover} -p /sbin/ldconfig
%postun -n libKReport3-%{sover} -p /sbin/ldconfig %postun -n libKReport3-%{sover} -p /sbin/ldconfig
@ -90,16 +89,15 @@ Development package for the Report Creation and Generation framework
%{_libdir}/libKReport3.so.* %{_libdir}/libKReport3.so.*
%files %files
%{_datadir}/kreport3/
%{_kf5_servicetypesdir}/kreport_elementplugin.desktop
%{_kf5_plugindir}/kreport3/ %{_kf5_plugindir}/kreport3/
%{_kf5_servicetypesdir}/kreport_elementplugin.desktop
%{_kf5_sharedir}/kreport3/
%files devel %files devel
%license COPYING* %license COPYING*
%{_includedir}/KReport3/ %{_includedir}/KReport3/
%{_libdir}/cmake/KReport3/ %{_kf5_cmakedir}/KReport3/
%{_libdir}/libKReport3.so %{_kf5_libdir}/libKReport3.so
#%%{_libdir}/pkgconfig/KReport3.pc
%{_kf5_mkspecsdir}/qt_KReport3.pri %{_kf5_mkspecsdir}/qt_KReport3.pri
%files lang -f %{name}.lang %files lang -f %{name}.lang