- Build with newer python on Leap 15

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=197
This commit is contained in:
Christophe Marin 2024-03-01 22:23:56 +00:00 committed by Git OBS Bridge
parent 9ea48ccd76
commit 194daaa0df
2 changed files with 13 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 1 21:47:15 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Build with newer python on Leap 15
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 26 15:34:05 UTC 2024 - Ben Greiner <code@bnavigator.de> Fri Jan 26 15:34:05 UTC 2024 - Ben Greiner <code@bnavigator.de>

View File

@ -24,8 +24,11 @@
%endif %endif
%endif %endif
# Default python version is too old in Leap 15 # Default python version is too old in Leap 15
%{?sle15_python_module_pythons}
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
%bcond_without python %define pyver python3
%else
%define pyver python311
%endif %endif
# SR#1043861 for 15.5 # SR#1043861 for 15.5
%if 0%{?suse_version} > 1500 || (0%{?is_opensuse} && 0%{?sle_version} > 150400) %if 0%{?suse_version} > 1500 || (0%{?is_opensuse} && 0%{?sle_version} > 150400)
@ -71,11 +74,9 @@ BuildRequires: libtiff-devel
BuildRequires: openjpeg2-devel BuildRequires: openjpeg2-devel
BuildRequires: perl BuildRequires: perl
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if %{with python} BuildRequires: %{pyver}-devel
BuildRequires: python3-devel BuildRequires: %{pyver}-qt5-devel
BuildRequires: python3-qt5-devel BuildRequires: %{pyver}-sip-devel
BuildRequires: python3-sip-devel
%endif
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: cmake(Immer) BuildRequires: cmake(Immer)
@ -127,9 +128,7 @@ BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(xcb-atom) BuildRequires: pkgconfig(xcb-atom)
BuildRequires: pkgconfig(xcb-xinput) BuildRequires: pkgconfig(xcb-xinput)
BuildRequires: pkgconfig(xi) >= 1.4.99.1 BuildRequires: pkgconfig(xi) >= 1.4.99.1
%if %{with python} Recommends: %{pyver}-qt5
Recommends: python3-qt5
%endif
Obsoletes: calligra-krita < %{version} Obsoletes: calligra-krita < %{version}
Provides: calligra-krita = %{version} Provides: calligra-krita = %{version}
Recommends: krita-plugin-gmic Recommends: krita-plugin-gmic
@ -165,10 +164,8 @@ Development headers and libraries for Krita.
chmod -x %{buildroot}%{_kf5_applicationsdir}/*.desktop chmod -x %{buildroot}%{_kf5_applicationsdir}/*.desktop
%if %{with python}
# remove shebang to avoid rpmlint warning, that file is not supposed to be run directly anyway # remove shebang to avoid rpmlint warning, that file is not supposed to be run directly anyway
sed -i "/#!\/usr\/bin\/env/d" %{buildroot}%{_kf5_libdir}/krita-python-libs/krita/sceditor/highlighter.py sed -i "/#!\/usr\/bin\/env/d" %{buildroot}%{_kf5_libdir}/krita-python-libs/krita/sceditor/highlighter.py
%endif
%ldconfig_scriptlets %ldconfig_scriptlets
@ -183,9 +180,7 @@ sed -i "/#!\/usr\/bin\/env/d" %{buildroot}%{_kf5_libdir}/krita-python-libs/krita
%{_kf5_appstreamdir}/ %{_kf5_appstreamdir}/
%{_kf5_libdir}/libkrita*.so.* %{_kf5_libdir}/libkrita*.so.*
%{_kf5_libdir}/kritaplugins/ %{_kf5_libdir}/kritaplugins/
%if %{with python}
%{_kf5_libdir}/krita-python-libs/ %{_kf5_libdir}/krita-python-libs/
%endif
%{_kf5_qmldir} %{_kf5_qmldir}
%{_kf5_sharedir}/kritaplugins/ %{_kf5_sharedir}/kritaplugins/
%{_kf5_sharedir}/color/ %{_kf5_sharedir}/color/