RPM: update python dependencies

pull/92/head
François Andriot 4 years ago
parent 424e58e320
commit 065214e736

@ -113,13 +113,14 @@ BuildRequires: libexif-devel
BuildRequires: readline-devel
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
%define python python2
%define __python %__python2
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%define python python
%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

@ -83,13 +83,16 @@ BuildRequires: brp-check-trinity
#BuildRequires: scons
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1550
%define python python2
%define __python %__python2
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%define python python
%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
%description

@ -33,7 +33,6 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define __arch_install_post %{nil}
@ -140,14 +139,17 @@ BuildRequires: xscreensaver-gl
%endif
%endif
# PYTHON
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%define python python2
%define __python %__python2
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%define python python
%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: python-tqt
Requires: trinity-python-trinity

@ -100,14 +100,17 @@ BuildRequires: libidn-devel
BuildRequires: gamin-devel
%endif
# PYTHON
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
%define python python2
%define __python %__python2
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%define python python
%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
# OPENSSL support
BuildRequires: openssl-devel

@ -70,14 +70,15 @@ BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1
BuildRequires: gcc-c++
# PYTHON
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
%define python python2
%define __python %__python2
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%define python python
%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

@ -42,8 +42,6 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
@ -72,12 +70,15 @@ BuildRequires: trinity-filesystem >= %{tde_version}
BuildRequires: gcc-c++
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
%define python python2
%define __python %__python2
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%define python python
%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

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
@ -76,13 +75,16 @@ BuildRequires: sip4-tqt-devel >= 4.10.5
Requires: sip4-tqt >= 4.10.5
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
%define python python2
%define __python %__python2
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%define python python
%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
Obsoletes: trinity-pykdeextensions < %{?epoch:%{epoch}:}%{version}-%{release}

@ -63,13 +63,14 @@ BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
%define python python2
%define __python %__python2
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%define python python
%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

@ -168,17 +168,17 @@ BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
## Python
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
%define python python2
%define __python %__python2
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%define python python
%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
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
## ruby
BuildRequires: ruby-devel >= 1.8

@ -97,13 +97,15 @@ BuildRequires: %{_lib}usb-compat0.1-devel
BuildRequires: libusb-devel
%endif
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500
%define python python3
%define __python %__python3
# PYTHON3 support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
%global python python3
%global __python %__python3
%global python_sitearch %{python3_sitearch}
%else
%define python python
%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

Loading…
Cancel
Save