- adjust for automake 1.16.4 changes

  https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests/25

diff --git a/xcb-proto-automake.patch b/xcb-proto-automake.patch
new file mode 100644 (file)
index 0000000..a6cceac
--- /dev/null
+++ b/xcb-proto-automake.patch
@@ -0,0 +1,14 @@
+Common subdirectories: xcb-proto-1.14.1.orig/doc and xcb-proto-1.14.1/doc
+Common subdirectories: xcb-proto-1.14.1.orig/src and xcb-proto-1.14.1/src
+diff -u xcb-proto-1.14.1.orig/xcb-proto.pc.in xcb-proto-1.14.1/xcb-proto.pc.in
+--- xcb-proto-1.14.1.orig/xcb-proto.pc.in      2020-10-08 22:31:54.000000000 +0000
++++ xcb-proto-1.14.1/xcb-proto.pc.in   2022-04-05 15:59:21.958915952 +0000
+@@ -4,6 +4,7 @@
+ datadir=@datadir@
+ libdir=@libdir@
+ xcbincludedir=${pc_sysrootdir}@xcbincludedir@
++PYTHON_PREFIX=@PYTHON_PREFIX@
+ pythondir=${pc_sysrootdir}@pythondir@
+ 
+ Name: XCB Proto
+Common subdirectories: xcb-proto-1.14.1.orig/xcbgen and xcb-proto-1.14.1/xcbgen

diff --git a/xcb-proto.spec b/xcb-proto.spec
index 8b4c7c45e42e98b74fb9e914b7b77d823380111c..a9fecccffbdbbd9a02844b83425e619d57607740 100644 (file)
--- a/xcb-proto.spec
+++ b/xcb-proto.spec
@@ -9,12 +9,13 @@ Summary:      XML-XCB protocol description files
 Summary(pl.UTF-8):     Pliki opisu protokołu XML-XCB
 Name:          xcb-proto
 Version:       1.14.1
-Release:       4
+Release:       5
 License:       MIT
 Group:         Development/Libraries
 #Source0:      https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
 Source0:       https://xorg.freedesktop.org/releases/individual/proto/%{name}-%{version}.tar.xz
 # Source0-md5: ecd6955dab1a7b9ba9756a11b8bdb48f
+Patch0:                %{name}-automake.patch
 URL:           https://xcb.freedesktop.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1:1.12.6
@@ -76,6 +77,7 @@ Moduł xcbgen dla Pythona 3.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # rebuild ac/am to use python3 sitescriptdir (apply automake/revert-debian-python-hacks.patch)