From 0e6f04248d716804071fd4f2a6dfc7a2b872dc59b634958c5b90b0f3c5bb6191 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 29 Mar 2020 08:27:15 +0000 Subject: [PATCH] Accepting request 789454 from home:wolfi323:branches:KDE:Applications - Build with python3 on Factory/Tumbleweed, continue to use python2 on Leap for now as the older boost_python3 is not found (kde#419237) OBS-URL: https://build.opensuse.org/request/show/789454 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kig?expand=0&rev=115 --- kig.changes | 7 +++++++ kig.spec | 18 +++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/kig.changes b/kig.changes index 70d12a4..003398c 100644 --- a/kig.changes +++ b/kig.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 28 17:15:02 UTC 2020 - Wolfgang Bauer + +- Build with python3 on Factory/Tumbleweed, continue to use python2 + on Leap for now as the older boost_python3 is not found + (kde#419237) + ------------------------------------------------------------------- Sun Mar 22 09:17:01 UTC 2020 - Luca Beltrame diff --git a/kig.spec b/kig.spec index b97ea4d..017a831 100644 --- a/kig.spec +++ b/kig.spec @@ -29,7 +29,6 @@ Group: Productivity/Scientific/Math URL: https://edu.kde.org Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz BuildRequires: kf5-filesystem -BuildRequires: python3-devel BuildRequires: update-desktop-files BuildRequires: cmake(KF5Archive) BuildRequires: cmake(KF5ConfigWidgets) @@ -48,11 +47,17 @@ BuildRequires: cmake(Qt5Test) >= 5.2.0 BuildRequires: cmake(Qt5XmlPatterns) >= 5.2.0 Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} +%if 0%{?suse_version} > 1500 +BuildRequires: libboost_python3-devel +BuildRequires: python3-devel +%else +BuildRequires: libboost_python-devel +BuildRequires: python-devel +%endif %if %{with lang} Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: libboost_python3-devel Recommends: %{name}-lang %description @@ -64,10 +69,14 @@ drawing mathematical figures and including them in other documents. %lang_package %prep -%autosetup -p1 +%setup -q %build +%if 0%{?suse_version} > 1500 + %cmake_kf5 -d build +%else %cmake_kf5 -d build -- -DBoost_NO_BOOST_CMAKE=ON +%endif %cmake_build %install @@ -90,8 +99,7 @@ drawing mathematical figures and including them in other documents. %{_kf5_mandir}/man* %{_kf5_plugindir}/ %{_kf5_servicesdir}/ -# Disabled for now (kde#419237) -# %{_kf5_sharedir}/katepart5/ +%{_kf5_sharedir}/katepart5/ %{_kf5_sharedir}/kig/ %{_kf5_sharedir}/kxmlgui5/