Accepting request 785536 from devel:languages:python
- Add missing dep on setuptools - Update to 1.19.1: * support for new python * remove support for python 2.x - Remove patch python38.patch OBS-URL: https://build.opensuse.org/request/show/785536 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pycairo?expand=0&rev=3
This commit is contained in:
commit
6f22ac5b5e
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786
|
||||
size 200610
|
3
pycairo-1.19.1.tar.gz
Normal file
3
pycairo-1.19.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2c143183280feb67f5beb4e543fd49990c28e7df427301ede04fc550d3562e84
|
||||
size 205196
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 16 09:47:12 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Add missing dep on setuptools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 16 09:33:07 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Update to 1.19.1:
|
||||
* support for new python
|
||||
* remove support for python 2.x
|
||||
- Remove patch python38.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 7 09:01:40 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-pycairo
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,25 +17,22 @@
|
||||
|
||||
|
||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||
%define skip_python2 1
|
||||
%define oldpython python
|
||||
Name: python-pycairo
|
||||
Version: 1.18.1
|
||||
Version: 1.19.1
|
||||
Release: 0
|
||||
Summary: Python Bindings for Cairo
|
||||
License: LGPL-2.1-or-later OR MPL-1.1
|
||||
URL: https://github.com/pygobject/pycairo
|
||||
Source: https://github.com/pygobject/pycairo/releases/download/v%{version}/pycairo-%{version}.tar.gz
|
||||
Patch0: python38.patch
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module pytest}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: cairo-devel >= 1.13.1
|
||||
BuildRequires: python-rpm-macros
|
||||
Provides: python-cairo = %{version}
|
||||
Obsoletes: python-cairo < %{version}
|
||||
%ifpython2
|
||||
Provides: %{oldpython}-cairo = %{version}
|
||||
Obsoletes: %{oldpython}-cairo < %{version}
|
||||
%endif
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
@ -48,10 +45,6 @@ Requires: python-pycairo = %{version}
|
||||
Requires: python-pycairo-common-devel = %{version}
|
||||
Provides: python-cairo-devel = %{version}
|
||||
Obsoletes: python-cairo-devel < %{version}
|
||||
%ifpython2
|
||||
Provides: %{oldpython}-cairo-devel = %{version}
|
||||
Obsoletes: %{oldpython}-cairo-devel < %{version}
|
||||
%endif
|
||||
|
||||
%description devel
|
||||
Pycairo is a Python module providing bindings for the cairo graphics library.
|
||||
@ -76,7 +69,6 @@ packages that depen on Pycairo.
|
||||
|
||||
%prep
|
||||
%setup -q -n pycairo-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%python_build
|
||||
@ -95,9 +87,6 @@ packages that depen on Pycairo.
|
||||
|
||||
%files %{python_files devel}
|
||||
%license COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
|
||||
%ifpython2
|
||||
%{_libdir}/pkgconfig/pycairo.pc
|
||||
%endif
|
||||
%ifpython3
|
||||
%{_libdir}/pkgconfig/py3cairo.pc
|
||||
%endif
|
||||
|
@ -1,26 +0,0 @@
|
||||
From 71c81741495cdce132b6f45a0f596d70909c1e4d Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Reiter <reiter.christoph@gmail.com>
|
||||
Date: Sat, 15 Jun 2019 16:07:00 +0200
|
||||
Subject: [PATCH] enum: explicitely set enum.__str__
|
||||
|
||||
Python 3.8 has removed the int.__str__ implementation. So we don't fall
|
||||
back to object.__str__ and thus enum.__repr__ set __str__ to int.__repr__
|
||||
instead. This gives us the same behaviour with all python versions.
|
||||
|
||||
See https://github.com/python/cpython/commit/96aeaec64738b730
|
||||
---
|
||||
cairo/enums.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/cairo/enums.c b/cairo/enums.c
|
||||
index 08fbaf3..4273232 100644
|
||||
--- a/cairo/enums.c
|
||||
+++ b/cairo/enums.c
|
||||
@@ -257,6 +257,7 @@ init_enums (PyObject *module) {
|
||||
PyObject *ev;
|
||||
|
||||
Pycairo_IntEnum_Type.tp_repr = (reprfunc)int_enum_repr;
|
||||
+ Pycairo_IntEnum_Type.tp_str = PYCAIRO_PyLong_Type.tp_repr;
|
||||
Pycairo_IntEnum_Type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
|
||||
Pycairo_IntEnum_Type.tp_methods = int_enum_methods;
|
||||
Pycairo_IntEnum_Type.tp_base = &PYCAIRO_PyLong_Type;
|
Loading…
Reference in New Issue
Block a user