From b6b535aa0be1316d6d18275b3febc4ea935bd58e Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Sun, 8 Nov 2020 09:08:58 +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/xcb-proto.git#c6e96dd456057325b25302ae6983ab5c160b782c
---
 .gitignore                    |  9 +-------
 sources                       |  2 +-
 xcb-proto-1.13-python39.patch | 39 -----------------------------------
 xcb-proto.spec                | 33 ++++++++++++++++++-----------
 4 files changed, 23 insertions(+), 60 deletions(-)
 delete mode 100644 xcb-proto-1.13-python39.patch

diff --git a/.gitignore b/.gitignore
index 1aa8a4e..89f2fb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-xcb-proto-1.6.tar.bz2
-/xcb-proto-1.7.tar.bz2
-/xcb-proto-1.8.tar.bz2
-/xcb-proto-1.9.tar.bz2
-/xcb-proto-1.10.tar.bz2
-/xcb-proto-1.11.tar.bz2
-/xcb-proto-1.12.tar.bz2
-/xcb-proto-1.13.tar.bz2
+/xcb-proto-*.tar.*
diff --git a/sources b/sources
index 0fe23f4..d45c770 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
+SHA512 (xcb-proto-1.14.1.tar.xz) = 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d
diff --git a/xcb-proto-1.13-python39.patch b/xcb-proto-1.13-python39.patch
deleted file mode 100644
index a9e9e07..0000000
--- a/xcb-proto-1.13-python39.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: xcb-proto-1.13/xcbgen/matcher.py
-===================================================================
---- xcb-proto-1.13.orig/xcbgen/matcher.py
-+++ xcb-proto-1.13/xcbgen/matcher.py
-@@ -7,7 +7,7 @@ we do not create a new type object, we j
- '''
- 
- from os.path import join
--from xml.etree.cElementTree import parse
-+from xml.etree.ElementTree import parse
- 
- from xcbgen.xtypes import *
- 
-Index: xcb-proto-1.13/xcbgen/state.py
-===================================================================
---- xcb-proto-1.13.orig/xcbgen/state.py
-+++ xcb-proto-1.13/xcbgen/state.py
-@@ -2,7 +2,7 @@
- This module contains the namespace class and the singleton module class.
- '''
- from os.path import dirname, basename
--from xml.etree.cElementTree import parse
-+from xml.etree.ElementTree import parse
- 
- from xcbgen import matcher
- from xcbgen.error import *
-Index: xcb-proto-1.13/xcbgen/align.py
-===================================================================
---- xcb-proto-1.13.orig/xcbgen/align.py
-+++ xcb-proto-1.13/xcbgen/align.py
-@@ -2,7 +2,7 @@
- This module contains helper classes for alignment arithmetic and checks
- '''
- 
--from fractions import gcd
-+from math import gcd
- 
- class Alignment(object):
- 
diff --git a/xcb-proto.spec b/xcb-proto.spec
index bb0a1f1..6ef7039 100644
--- a/xcb-proto.spec
+++ b/xcb-proto.spec
@@ -1,22 +1,17 @@
-%define debug_package %{nil}
-
 Name:           xcb-proto
-Version:        1.13
-Release:        14%{?dist}
+Version:        1.14.1
+Release:        1%{?dist}
 Summary:        XCB protocol descriptions
 
 License:        MIT
 URL:            https://xcb.freedesktop.org/
-Source0:        https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
-
-# cElementTree no longer exists in Python 3.9
-# fractions.gcd has been replaced by math.gcd
-Patch0001:      xcb-proto-1.13-python39.patch
+Source0:        https://xorg.freedesktop.org/archive/individual/proto/%{name}-%{version}.tar.xz
 
 BuildArch:      noarch
 
-BuildRequires:	python3-devel
-Requires:       pkgconfig
+BuildRequires:  libxml2
+BuildRequires:  make
+BuildRequires:  python3-devel
 
 %description
 XCB is a project to enable efficient language bindings to the X11 protocol.
@@ -24,27 +19,41 @@ This package contains the protocol descriptions themselves.  Language
 bindings use these protocol descriptions to generate code for marshalling
 the protocol.
 
+
 %prep
 %autosetup -p1
 
+
 %build
 # Bit of a hack to get the pc file in /usr/share, so we can be noarch.
 %configure --libdir=%{_datadir}
 %make_build
 
+
 %install
 %make_install
 
+
+%check
+%make_build check
+
+
 %files
 %license COPYING
-%doc NEWS README TODO doc/xml-xcb.txt
+%doc NEWS README.md TODO doc/xml-xcb.txt
 %{_datadir}/pkgconfig/xcb-proto.pc
 %dir %{_datadir}/xcb/
 %{_datadir}/xcb/*.xsd
 %{_datadir}/xcb/*.xml
 %{python3_sitelib}/xcbgen
 
+
 %changelog
+* Tue Oct 13 2020 Björn Esser <besser82@fedoraproject.org> - 1.14.1-1
+- xcb-proto 1.14.1
+- Enable testsuite
+- Explicit BR: make
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.13-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild