rpms/vips
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop Python 2 subpackage for https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal

Browse Source
This commit is contained in:
Benjamin Gilbert 2018-10-03 10:44:31 -04:00
parent bf9e4dffce
commit 050f916aff
1 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
vips.spec
View File

@ -38,8 +38,8 @@ BuildRequires: giflib-devel
BuildRequires: gcc-c++
BuildRequires: pkgconfig gettext
BuildRequires: python2-devel python3-devel
BuildRequires: swig gtk-doc
BuildRequires: python3-devel
BuildRequires: gtk-doc
%description
@ -70,22 +70,6 @@ Requires: vips%{?_isa} = %{version}-%{release}
The %{name}-tools package contains command-line tools for working with VIPS.
%package -n python2-vips
Summary: Python 2 support for %{name}
Requires: vips%{?_isa} = %{version}-%{release}
Requires: python2-gobject-base
Provides: python2-vipsCC = %{version}-%{release}
Provides: python2-vipsCC%{?_isa} = %{version}-%{release}
Provides: vips-python = %{version}-%{release}
Provides: vips-python%{?_isa} = %{version}-%{release}
Obsoletes: vips-python < 8.4.4-6
%{?python_provide:%python_provide python2-vips}
%{?python_provide:%python_provide python2-vipsCC}
%description -n python2-vips
The %{name}-python package contains Python 2 support for VIPS.
%package -n python3-vips
Summary: Python 3 support for %{name}
Requires: vips%{?_isa} = %{version}-%{release}
@ -94,7 +78,6 @@ Provides: vips-python3 = %{version}-%{release}
Provides: vips-python3%{?_isa} = %{version}-%{release}
Obsoletes: vips-python3 < 8.4.4-6
%{?python_provide:%python_provide python3-vips}
# No provide for python3-vipsCC, since we only have the gi overrides
%description -n python3-vips
The %{name}-python3 package contains Python 3 support for VIPS.
@ -122,7 +105,7 @@ sed -i 's|sys_lib_dlsearch_path_spec="|sys_lib_dlsearch_path_spec="/%{_lib} %{_l
# https://github.com/libvips/libvips/pull/212#issuecomment-68177930
export CFLAGS="%{optflags} -ftree-vectorize"
export CXXFLAGS="%{optflags} -ftree-vectorize"
%configure --disable-static --enable-gtk-doc --enable-pyvips7 --enable-pyvips8 PYTHON=%{_bindir}/python2
%configure --disable-static --enable-gtk-doc --enable-pyvips8 PYTHON=%{_bindir}/python3
make %{?_smp_mflags}
@ -136,14 +119,6 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips
# locale stuff
%find_lang vips%{vips_version_base}
# Upstream supports the GI override module on Python 3, but doesn't install
# it into the Python 3 path
mkdir -p ${RPM_BUILD_ROOT}%{python3_sitearch}
cp -a ${RPM_BUILD_ROOT}%{python2_sitearch}/gi \
${RPM_BUILD_ROOT}%{python3_sitearch}
find ${RPM_BUILD_ROOT}%{python3_sitearch} \
\( -name '*.pyc' -o -name '*.pyo' \) -delete
%files -f vips%{vips_version_base}.lang
%doc AUTHORS NEWS THANKS TODO ChangeLog
@ -166,11 +141,6 @@ find ${RPM_BUILD_ROOT}%{python3_sitearch} \
%{_mandir}/man1/*
%files -n python2-vips
%{python2_sitearch}/gi/overrides/*
%{python2_sitearch}/vipsCC/
%files -n python3-vips
%{python3_sitearch}/gi/overrides/*.py
%{python3_sitearch}/gi/overrides/__pycache__/*
@ -183,6 +153,8 @@ find ${RPM_BUILD_ROOT}%{python3_sitearch} \
%changelog
* Wed Oct 03 2018 Benjamin Gilbert <bgilbert@backtick.net> - 8.6.5-4
- Drop Python 2 subpackage for https://fedoraproject.org/wiki/Changes/Mass_Pytho
n_2_Package_Removal
- Update package URLs
* Tue Aug 28 2018 Michael Cronenworth <mike@cchtml.com> - 8.6.5-3