From 86983e06002ab9c303a0e395c974d93d7745db3d Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 4 Nov 2020 16:06:27 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/pycairo.git#745a48cd8c528fe1c0ef733b94bf6042dfab73ef
---
 .gitignore   |  1 +
 pycairo.spec | 46 ++++++----------------------------------------
 sources      |  2 +-
 3 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 640952e..8067cae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ pycairo-1.8.8.tar.gz
 /pycairo-1.18.0.tar.gz
 /pycairo-1.18.1.tar.gz
 /pycairo-1.18.2.tar.gz
+/pycairo-1.20.0.tar.gz
diff --git a/pycairo.spec b/pycairo.spec
index afee668..30e37ff 100644
--- a/pycairo.spec
+++ b/pycairo.spec
@@ -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 @@ Source0: https://github.com/pygobject/pycairo/releases/download/v%{version}/pyca
 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 @@ BuildRequires: python3-setuptools
 %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 @@ Summary: Python 3 bindings for the cairo library
 %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 @@ libraries so that they interoperate with py3cairo.
 %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
 
diff --git a/sources b/sources
index 3be4701..a532b01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pycairo-1.18.2.tar.gz) = 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
+SHA512 (pycairo-1.20.0.tar.gz) = d32d008b741653d02324b206a438f5fd85f2a433201d6f8b98c8f1adc712abea611a4b5ed95c55258efb662dc579eed6b2f752b10d9fc2b6a7c8e5edd19e5266