diff options
author | François Andriot <albator78@libertysurf.fr> | 2022-05-15 09:14:59 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2022-05-15 09:27:38 +0200 |
commit | 11b59120b4b653f7915851ada6673e3d38b032f8 (patch) | |
tree | 4dd35cae65670867e7a810af4b7d5c40dfdcd123 /redhat/applications | |
parent | c09543aa3d09abae6779b5e16ed5dc416d8e7c70 (diff) | |
download | tde-packaging-11b59120b4b653f7915851ada6673e3d38b032f8.tar.gz tde-packaging-11b59120b4b653f7915851ada6673e3d38b032f8.zip |
RPM: add support for openSuse Leap 15.4
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/applications')
-rw-r--r-- | redhat/applications/amarok/amarok.spec | 5 | ||||
-rw-r--r-- | redhat/applications/koffice/koffice.spec | 9 | ||||
-rw-r--r-- | redhat/applications/tde-systemsettings/tde-systemsettings.spec | 2 | ||||
-rw-r--r-- | redhat/applications/tellico/tellico.spec | 5 | ||||
-rw-r--r-- | redhat/applications/wlassistant/wlassistant.spec | 5 |
5 files changed, 25 insertions, 1 deletions
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec index e2b03ffc1..eee0076ca 100644 --- a/redhat/applications/amarok/amarok.spec +++ b/redhat/applications/amarok/amarok.spec @@ -264,6 +264,10 @@ BuildRequires: rubypick %endif # PYTHON support +%if 0%{?sle_version} >= 150400 +%define python python3 +%define __python %__python3 +%else %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 @@ -271,6 +275,7 @@ BuildRequires: rubypick %else %global python python %endif +%endif %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} BuildRequires: %{python} BuildRequires: %{python}-devel diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec index a27bbc6f0..43b5365eb 100644 --- a/redhat/applications/koffice/koffice.spec +++ b/redhat/applications/koffice/koffice.spec @@ -113,7 +113,11 @@ BuildRequires: libexif-devel BuildRequires: readline-devel # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%if 0%{?sle_version} >= 150400 +%define with_python 0 +%else +%define with_python 1 +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} @@ -123,6 +127,7 @@ BuildRequires: readline-devel %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} BuildRequires: %{python} BuildRequires: %{python}-devel +%endif # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 @@ -381,8 +386,10 @@ Requires: perl %{tde_tdeappdir}/*koshell.desktop %{tde_datadir}/apps/kofficewidgets/ %if 0%{?with_kross} +%if 0%{?with_python} %{tde_datadir}/apps/kross/ %{tde_tdelibdir}/krosspython.* +%endif %if 0%{?with_ruby} %{tde_tdelibdir}/krossruby.* %endif diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec index 4e6f9a959..c51e46f4c 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec @@ -84,7 +84,9 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +%if 0%{?suse_version} == 0 || 0%{?sle_version} <= 150300 Requires: trinity-guidance +%endif %description diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec index ce61b2048..d8e8acc36 100644 --- a/redhat/applications/tellico/tellico.spec +++ b/redhat/applications/tellico/tellico.spec @@ -154,6 +154,10 @@ BuildRequires: libacl-devel BuildRequires: libattr-devel # PYTHON support +%if 0%{?sle_version} >= 150400 +%define python python3 +%define __python %__python3 +%else %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 @@ -161,6 +165,7 @@ BuildRequires: libattr-devel %else %global python python %endif +%endif %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} BuildRequires: %{python} BuildRequires: %{python}-devel diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec index 033460cad..2eb075d59 100644 --- a/redhat/applications/wlassistant/wlassistant.spec +++ b/redhat/applications/wlassistant/wlassistant.spec @@ -102,6 +102,10 @@ BuildRequires: gamin-devel %endif # PYTHON support +%if 0%{?sle_version} >= 150400 +%define python python3 +%define __python %__python3 +%else %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 @@ -109,6 +113,7 @@ BuildRequires: gamin-devel %else %global python python %endif +%endif %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} BuildRequires: %{python} BuildRequires: %{python}-devel |