From f40ebcfb55e836c225b157e4c9c067ebdbc90e94 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 20 Jun 2019 13:17:49 +1000
Subject: [PATCH] xorgproto 2019.1

---
 .gitignore                |  1 +
 sources                   |  2 +-
 xorg-x11-proto-devel.spec | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index bd1caca..ec7d8ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,3 +134,4 @@ inputproto-2.0.1.tar.bz2
 /xorgproto-2018.2.tar.bz2
 /xorgproto-2018.3.tar.bz2
 /xorgproto-2018.4.tar.bz2
+/xorgproto-2019.1.tar.bz2
diff --git a/sources b/sources
index d5316e1..d0e2b29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xorgproto-2018.4.tar.bz2) = 2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c
+SHA512 (xorgproto-2019.1.tar.bz2) = f26c17f4a027acdc799b532fa65c3ea1b0e8c30794c7b7293060ee9d9dec84b4878966cd2dcda43584849232e73a208abd4213374f89b05c10e5aae92bdc00be
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 7244686..917c5c6 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -1,9 +1,12 @@
 %global debug_package %{nil}
 
+# When releasing a xorg-x11-proto-devel version with updated keysyms,
+# rebuild libX11
+
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 2018.4
-Release: 3%{?dist}
+Version: 2019.1
+Release: 1%{?dist}
 License: MIT
 URL: https://www.x.org
 BuildArch: noarch
@@ -25,7 +28,7 @@ X.Org X11 Protocol headers
 
 %build
 autoreconf -f -i -v
-%configure --without-xmlto
+%configure --disable-specs
 make %{?_smp_mflags}
 
 
@@ -54,9 +57,6 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %dir %{_includedir}/X11
 %{_includedir}/X11/DECkeysym.h
 %{_includedir}/X11/HPkeysym.h
-%dir %{_includedir}/X11/PM
-%{_includedir}/X11/PM/PM.h
-%{_includedir}/X11/PM/PMproto.h
 %{_includedir}/X11/Sunkeysym.h
 %{_includedir}/X11/X.h
 %{_includedir}/X11/XF86keysym.h
@@ -163,8 +163,6 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_includedir}/X11/extensions/xf86dgaconst.h
 %{_includedir}/X11/extensions/xf86dgaproto.h
 %{_includedir}/X11/extensions/xf86dgastr.h
-%{_includedir}/X11/extensions/xf86misc.h
-%{_includedir}/X11/extensions/xf86mscstr.h
 %{_includedir}/X11/extensions/xf86vm.h
 %{_includedir}/X11/extensions/xf86vmproto.h
 %{_includedir}/X11/extensions/xf86vmstr.h
@@ -206,14 +204,16 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_datadir}/pkgconfig/xf86bigfontproto.pc
 %{_datadir}/pkgconfig/xf86dgaproto.pc
 %{_datadir}/pkgconfig/xf86driproto.pc
-%{_datadir}/pkgconfig/xf86miscproto.pc
 %{_datadir}/pkgconfig/xf86vidmodeproto.pc
 %{_datadir}/pkgconfig/xineramaproto.pc
 %{_datadir}/pkgconfig/xproto.pc
-%{_datadir}/pkgconfig/xproxymngproto.pc
 %{_docdir}/xorgproto/*
 
 %changelog
+* Thu Jun 20 2019 Peter Hutterer <peter.hutterer@redhat.com> 2019.1-1
+- xorgproto 2019.1
+- drop files for xf86misc and proxy management proto, they're legacy now
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2018.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild