PR#6: Update to 1.20.0 - rpms/pycairo

rpms / pycairo

#6 Update to 1.20.0

Merged 2 years ago by kalev. Opened 2 years ago by thrnciar.

rpms/ thrnciar/pycairo update-to-1.20.0 into master

Tomas Hrnciar • 2 years ago

745a48c

.gitignore

file modified

		`@@ -12,3 +12,4 @@`
		`/pycairo-1.18.0.tar.gz`
		`/pycairo-1.18.1.tar.gz`
		`/pycairo-1.18.2.tar.gz`
		`+ /pycairo-1.20.0.tar.gz`

pycairo.spec

file modified

+6 -40

		`@@ -1,6 +1,6 @@`
		`Name: pycairo`
		`- Version: 1.18.2`
		`- Release: 6%{?dist}`
		`+ Version: 1.20.0`
		`+ Release: 1%{?dist}`
		`Summary: Python bindings for the cairo library`

		`License: MPLv1.1 or LGPLv2`
		`@@ -10,8 +10,6 @@`
		`BuildRequires: cairo-devel`
		`BuildRequires: gcc`
		`BuildRequires: pkgconfig`
		`- BuildRequires: python2-devel`
		`- BuildRequires: python2-setuptools`
		`BuildRequires: python3-devel`
		`BuildRequires: python3-pytest`
		`BuildRequires: python3-setuptools`
		`@@ -19,17 +17,6 @@`
		`%description`
		`Python bindings for the cairo library.`

		`- %package -n python2-cairo`
		`- Summary: Python 2 bindings for the cairo library`
		`- %{?python_provide:%python_provide python2-cairo}`
		`- # Renamed in F27`
		`- Obsoletes: pycairo < 1.15.2`
		`- Provides: pycairo = %{version}-%{release}`
		`- Provides: pycairo%{?_isa} = %{version}-%{release}`
		`-`
		`- %description -n python2-cairo`
		`- Python 2 bindings for the cairo library.`
		`-`
		`%package -n python3-cairo`
		`Summary: Python 3 bindings for the cairo library`
		`%{?python_provide:%python_provide python3-cairo}`
		`@@ -37,19 +24,6 @@`
		`%description -n python3-cairo`
		`Python 3 bindings for the cairo library.`

		`- %package -n python2-cairo-devel`
		`- Summary: Libraries and headers for pycairo`
		`- Requires: python2-cairo%{?_isa} = %{version}-%{release}`
		`- Requires: python2-devel`
		`- # Renamed in F27`
		`- Obsoletes: pycairo-devel < 1.15.2`
		`- Provides: pycairo-devel = %{version}-%{release}`
		`- Provides: pycairo-devel%{?_isa} = %{version}-%{release}`
		`-`
		`- %description -n python2-cairo-devel`
		`- This package contains files required to build wrappers for cairo add-on`
		`- libraries so that they interoperate with pycairo.`
		`-`
		`%package -n python3-cairo-devel`
		`Summary: Libraries and headers for py3cairo`
		`Requires: python3-cairo%{?_isa} = %{version}-%{release}`
		`@@ -63,37 +37,29 @@`
		`%autosetup -p1`

		`%build`
		`- %py2_build`
		`%py3_build`

		`%install`
		`- %py2_install`
		`%py3_install`

		`%check`
		`%{__python3} setup.py test`

		`- %files -n python2-cairo`
		`- %license COPYING*`
		`- %{python2_sitearch}/cairo/`
		`- %{python2_sitearch}/pycairo*.egg-info`
		`-`
		`%files -n python3-cairo`
		`%license COPYING*`
		`%{python3_sitearch}/cairo/`
		`%{python3_sitearch}/pycairo*.egg-info`

		`- %files -n python2-cairo-devel`
		`- %dir %{_includedir}/pycairo`
		`- %{_includedir}/pycairo/pycairo.h`
		`- %{_libdir}/pkgconfig/pycairo.pc`
		`-`
		`%files -n python3-cairo-devel`
		`%dir %{_includedir}/pycairo`
		`%{_includedir}/pycairo/py3cairo.h`
		`%{_libdir}/pkgconfig/py3cairo.pc`

		`%changelog`
		`+ * Wed Nov 04 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1.20.0-1`
		`+ - Update to 1.20.0 (bgz#1493325)`
		`+ - Move python2-cairo to a separate component`
		`+`
		`* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-6`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (pycairo-1.18.2.tar.gz) = 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0`
		`+ SHA512 (pycairo-1.20.0.tar.gz) = d32d008b741653d02324b206a438f5fd85f2a433201d6f8b98c8f1adc712abea611a4b5ed95c55258efb662dc579eed6b2f752b10d9fc2b6a7c8e5edd19e5266`

no initial comment

kalev commented 2 years ago

A problem here is that I believe pycairo 1.20 no longer supports python 2.7. We may have to do a separate python2-pycairo SRPM 1.18 to avoid breaking GIMP that still needs it.

churchyard commented 2 years ago

Indeed.

+ /usr/bin/python2 setup.py build '--executable=/usr/bin/python2 -s'
Traceback (most recent call last):
  File "setup.py", line 568, in <module>
    main()
  File "setup.py", line 489, in main
    raise Exception("Python 2 no longer supported")
Exception: Python 2 no longer supported

churchyard commented 2 years ago