From 5765d09726776b42887c8b3adda5e6c713ffe403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sun, 9 Aug 2020 11:44:21 +0200 Subject: [PATCH] spec: replace hardcoded python3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Frédéric Pierret (fepitre) --- python-pillow.spec | 86 +++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/python-pillow.spec b/python-pillow.spec index c789697..b4a85f3 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -34,19 +34,19 @@ BuildRequires: openjpeg2-devel BuildRequires: tk-devel BuildRequires: zlib-devel -BuildRequires: python3-cffi -BuildRequires: python3-devel -BuildRequires: python3-numpy -BuildRequires: python3-olefile -BuildRequires: python3-qt5 -BuildRequires: python3-setuptools +BuildRequires: python%{python3_pkgversion}-cffi +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-numpy +BuildRequires: python%{python3_pkgversion}-olefile +BuildRequires: python%{python3_pkgversion}-qt5 +BuildRequires: python%{python3_pkgversion}-setuptools %if 0%{?with_docs} BuildRequires: make -BuildRequires: python3-sphinx -BuildRequires: python3-sphinx_rtd_theme -BuildRequires: python3-sphinx-removed-in +BuildRequires: python%{python3_pkgversion}-sphinx +BuildRequires: python%{python3_pkgversion}-sphinx_rtd_theme +BuildRequires: python%{python3_pkgversion}-sphinx-removed-in %endif -BuildRequires: python3-tkinter +BuildRequires: python%{python3_pkgversion}-tkinter # For EpsImagePlugin.py Requires: ghostscript @@ -63,14 +63,14 @@ There are four subpackages: tk (tk interface), qt (PIL image wrapper for Qt), devel (development) and doc (documentation). -%package -n python3-%{srcname} +%package -n python%{python3_pkgversion}-%{srcname} Summary: Python 3 image processing library -%{?python_provide:%python_provide python3-%{srcname}} -Provides: python3-imaging = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} +Provides: python%{python3_pkgversion}-imaging = %{version}-%{release} # For MicImagePlugin.py, FpxImagePlugin.py -Requires: python3-olefile +Requires: python%{python3_pkgversion}-olefile -%description -n python3-%{srcname} +%description -n python%{python3_pkgversion}-%{srcname} Python image processing library, fork of the Python Imaging Library (PIL) This library provides extensive file format support, an efficient @@ -80,47 +80,47 @@ There are four subpackages: tk (tk interface), qt (PIL image wrapper for Qt), devel (development) and doc (documentation). -%package -n python3-%{srcname}-devel +%package -n python%{python3_pkgversion}-%{srcname}-devel Summary: Development files for %{srcname} -Requires: python3-devel, libjpeg-devel, zlib-devel -Requires: python3-%{srcname}%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python3-%{srcname}-devel} -Provides: python3-imaging-devel = %{version}-%{release} +Requires: python%{python3_pkgversion}-devel, libjpeg-devel, zlib-devel +Requires: python%{python3_pkgversion}-%{srcname}%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-devel} +Provides: python%{python3_pkgversion}-imaging-devel = %{version}-%{release} -%description -n python3-%{srcname}-devel +%description -n python%{python3_pkgversion}-%{srcname}-devel Development files for %{srcname}. -%package -n python3-%{srcname}-doc +%package -n python%{python3_pkgversion}-%{srcname}-doc Summary: Documentation for %{srcname} BuildArch: noarch -Requires: python3-%{srcname} = %{version}-%{release} -%{?python_provide:%python_provide python3-%{srcname}-doc} -Provides: python3-imaging-doc = %{version}-%{release} +Requires: python%{python3_pkgversion}-%{srcname} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-doc} +Provides: python%{python3_pkgversion}-imaging-doc = %{version}-%{release} -%description -n python3-%{srcname}-doc +%description -n python%{python3_pkgversion}-%{srcname}-doc Documentation for %{srcname}. -%package -n python3-%{srcname}-tk +%package -n python%{python3_pkgversion}-%{srcname}-tk Summary: Tk interface for %{srcname} -Requires: python3-tkinter -Requires: python3-%{srcname}%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python3-%{srcname}-tk} -Provides: python3-imaging-tk = %{version}-%{release} +Requires: python%{python3_pkgversion}-tkinter +Requires: python%{python3_pkgversion}-%{srcname}%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-tk} +Provides: python%{python3_pkgversion}-imaging-tk = %{version}-%{release} -%description -n python3-%{srcname}-tk +%description -n python%{python3_pkgversion}-%{srcname}-tk Tk interface for %{name}. -%package -n python3-%{srcname}-qt +%package -n python%{python3_pkgversion}-%{srcname}-qt Summary: Qt %{srcname} image wrapper -Requires: python3-qt5 -Requires: python3-%{srcname}%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python3-%{srcname}-qt} -Provides: python3-imaging-qt = %{version}-%{release} +Requires: python%{python3_pkgversion}-qt5 +Requires: python%{python3_pkgversion}-%{srcname}%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-qt} +Provides: python%{python3_pkgversion}-imaging-qt = %{version}-%{release} -%description -n python3-%{srcname}-qt +%description -n python%{python3_pkgversion}-%{srcname}-qt Qt %{srcname} image wrapper. @@ -154,7 +154,7 @@ pushd build/%py3_libbuilddir PYTHONPATH=$PWD %{__python3} selftest.py popd -%files -n python3-%{srcname} +%files -n python%{python3_pkgversion}-%{srcname} %doc README.md CHANGES.rst %license docs/COPYING %{python3_sitearch}/PIL/ @@ -168,22 +168,22 @@ popd %exclude %{python3_sitearch}/PIL/__pycache__/SpiderImagePlugin* %exclude %{python3_sitearch}/PIL/__pycache__/ImageQt* -%files -n python3-%{srcname}-devel +%files -n python%{python3_pkgversion}-%{srcname}-devel %{py3_incdir}/Imaging/ -%files -n python3-%{srcname}-doc +%files -n python%{python3_pkgversion}-%{srcname}-doc %if 0%{?with_docs} %doc docs/_build_py3/html %endif -%files -n python3-%{srcname}-tk +%files -n python%{python3_pkgversion}-%{srcname}-tk %{python3_sitearch}/PIL/_imagingtk* %{python3_sitearch}/PIL/ImageTk* %{python3_sitearch}/PIL/SpiderImagePlugin* %{python3_sitearch}/PIL/__pycache__/ImageTk* %{python3_sitearch}/PIL/__pycache__/SpiderImagePlugin* -%files -n python3-%{srcname}-qt +%files -n python%{python3_pkgversion}-%{srcname}-qt %{python3_sitearch}/PIL/ImageQt* %{python3_sitearch}/PIL/__pycache__/ImageQt*