diff options
author | François Andriot <albator78@libertysurf.fr> | 2021-03-02 19:50:55 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2021-03-02 19:52:11 +0100 |
commit | 12dcc700a83c4c76187e9bbcd046a032a202872e (patch) | |
tree | 94abe8ac4fa6c5b4f2da6c7177662f0bbe9d4afc /redhat/applications | |
parent | c5de148f49058ceede8b98a0fd81262fbe0eb31d (diff) | |
download | tde-packaging-12dcc700a83c4c76187e9bbcd046a032a202872e.tar.gz tde-packaging-12dcc700a83c4c76187e9bbcd046a032a202872e.zip |
RPM: add support for Mageia 8
Diffstat (limited to 'redhat/applications')
-rw-r--r-- | redhat/applications/amarok/amarok.spec | 14 | ||||
-rw-r--r-- | redhat/applications/koffice/koffice.spec | 2 | ||||
-rw-r--r-- | redhat/applications/konversation/konversation.spec | 2 | ||||
-rw-r--r-- | redhat/applications/tde-guidance/tde-guidance.spec | 4 | ||||
-rw-r--r-- | redhat/applications/tdenetworkmanager/tdenetworkmanager.spec | 7 | ||||
-rw-r--r-- | redhat/applications/tellico/tellico.spec | 14 | ||||
-rw-r--r-- | redhat/applications/wlassistant/wlassistant.spec | 2 |
7 files changed, 37 insertions, 8 deletions
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec index 593d1b57b..4cb14e778 100644 --- a/redhat/applications/amarok/amarok.spec +++ b/redhat/applications/amarok/amarok.spec @@ -251,6 +251,18 @@ BuildRequires: ruby-devel BuildRequires: rubypick %endif +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%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 + # To open the selected browser, works with Patch2 Requires: xdg-utils Requires(post): xdg-utils @@ -428,7 +440,7 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" -e "s|Config\.|RbConfig\.|g" fi -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 %__sed -i "amarok/src/scripts/common/Publisher.py" \ "amarok/src/scripts/common/Zeroconf.py" \ "amarok/src/scripts/playlist2html/Playlist.py" \ diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec index 420a08dc3..ea5fcde82 100644 --- a/redhat/applications/koffice/koffice.spec +++ b/redhat/applications/koffice/koffice.spec @@ -113,7 +113,7 @@ BuildRequires: libexif-devel BuildRequires: readline-devel # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec index 9a2c87f2b..180359db0 100644 --- a/redhat/applications/konversation/konversation.spec +++ b/redhat/applications/konversation/konversation.spec @@ -176,7 +176,7 @@ and experienced users alike will appreciate its many features: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 %__sed -i "konversation/scripts/media" \ "konversation/scripts/weather" \ -e "s|/usr/bin/env python|/usr/bin/env python2|" diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec index e2c865bbd..98c5cbe9d 100644 --- a/redhat/applications/tde-guidance/tde-guidance.spec +++ b/redhat/applications/tde-guidance/tde-guidance.spec @@ -140,7 +140,7 @@ BuildRequires: xscreensaver-gl %endif # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} @@ -431,7 +431,7 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py # Replace all '#!' calls to python with /usr/bin/python # and make them executable -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 %define python /usr/bin/python2 %else %define python /usr/bin/python diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec index 18a571008..330abad3a 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec @@ -96,7 +96,12 @@ Requires: NetworkManager-gnome %if 0%{?mdkversion} || 0%{?mgaversion} Requires: networkmanager %endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} != 8 +BuildRequires: %{_lib}nm-util-devel +%endif +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} %if 0%{?pclinuxos} == 0 %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 BuildRequires: NetworkManager-libnm-devel diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec index fa04c4ba8..eb1b910a1 100644 --- a/redhat/applications/tellico/tellico.spec +++ b/redhat/applications/tellico/tellico.spec @@ -153,6 +153,18 @@ BuildRequires: libacl-devel # ATTR support BuildRequires: libattr-devel +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%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 + Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release} @@ -272,7 +284,7 @@ if [ -r /usr/include/libv4l1-videodev.h ]; then %__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|" fi -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 %__sed -i "src/fetch/scripts/dark_horse_comics.py" \ "src/fetch/scripts/ministerio_de_cultura.py" \ "src/fetch/scripts/fr.allocine.py" \ diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec index 274c94a11..36b8cd110 100644 --- a/redhat/applications/wlassistant/wlassistant.spec +++ b/redhat/applications/wlassistant/wlassistant.spec @@ -101,7 +101,7 @@ BuildRequires: gamin-devel %endif # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} |