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
This commit is contained in:
Luca Beltrame 2020-03-29 08:27:15 +00:00 committed by Git OBS Bridge
parent 5d2835f47d
commit 0e6f04248d
2 changed files with 20 additions and 5 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Mar 28 17:15:02 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
- 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 <lbeltrame@kde.org> Sun Mar 22 09:17:01 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>

View File

@ -29,7 +29,6 @@ Group: Productivity/Scientific/Math
URL: https://edu.kde.org URL: https://edu.kde.org
Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: python3-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: cmake(KF5Archive) BuildRequires: cmake(KF5Archive)
BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5ConfigWidgets)
@ -48,11 +47,17 @@ BuildRequires: cmake(Qt5Test) >= 5.2.0
BuildRequires: cmake(Qt5XmlPatterns) >= 5.2.0 BuildRequires: cmake(Qt5XmlPatterns) >= 5.2.0
Obsoletes: %{name}5 < %{version} Obsoletes: %{name}5 < %{version}
Provides: %{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} %if %{with lang}
Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring Source2: applications.keyring
%endif %endif
BuildRequires: libboost_python3-devel
Recommends: %{name}-lang Recommends: %{name}-lang
%description %description
@ -64,10 +69,14 @@ drawing mathematical figures and including them in other documents.
%lang_package %lang_package
%prep %prep
%autosetup -p1 %setup -q
%build %build
%if 0%{?suse_version} > 1500
%cmake_kf5 -d build
%else
%cmake_kf5 -d build -- -DBoost_NO_BOOST_CMAKE=ON %cmake_kf5 -d build -- -DBoost_NO_BOOST_CMAKE=ON
%endif
%cmake_build %cmake_build
%install %install
@ -90,8 +99,7 @@ drawing mathematical figures and including them in other documents.
%{_kf5_mandir}/man* %{_kf5_mandir}/man*
%{_kf5_plugindir}/ %{_kf5_plugindir}/
%{_kf5_servicesdir}/ %{_kf5_servicesdir}/
# Disabled for now (kde#419237) %{_kf5_sharedir}/katepart5/
# %{_kf5_sharedir}/katepart5/
%{_kf5_sharedir}/kig/ %{_kf5_sharedir}/kig/
%{_kf5_sharedir}/kxmlgui5/ %{_kf5_sharedir}/kxmlgui5/