From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 10 Oct 2019 14:28:23 +0000 (+0200)
Subject: - don't package extensions/XKBgeom.h (moved to libX11); release 3
X-Git-Tag: auto/th/xorg-proto-xorgproto-2019.1-2019.1.3
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-proto-xorgproto.git;a=commitdiff_plain;h=28cc7e0

- don't package extensions/XKBgeom.h (moved to libX11); release 3
---

diff --git a/xorg-proto-xorgproto.spec b/xorg-proto-xorgproto.spec
index a38a158..bf7320c 100644
--- a/xorg-proto-xorgproto.spec
+++ b/xorg-proto-xorgproto.spec
@@ -3,7 +3,7 @@
 # whole package version
 %define	ver		2019.1
 # package release
-%define	rel		2
+%define	rel		3
 # subpackage versions (see .pc files) # last standalone spec EVR as comment
 %define	applewm_ver	1.4.2		# 1.2.0-1
 %define	bigreqs_ver	1.1.2		# 1.1.2-2
@@ -683,6 +683,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# moved to libX11 >= 1.6.9
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/X11/extensions/XKBgeom.h
 # moved to libXvMC >= 1.0.12
 %{__rm} $RPM_BUILD_ROOT%{_includedir}/X11/extensions/vldXvMC.h
 
@@ -801,7 +803,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYING-kbproto specs/kbproto/{XKBproto-*.svg,xkbproto.html}
 %{_includedir}/X11/extensions/XKB.h
-%{_includedir}/X11/extensions/XKBgeom.h
 %{_includedir}/X11/extensions/XKBproto.h
 %{_includedir}/X11/extensions/XKBsrv.h
 %{_includedir}/X11/extensions/XKBstr.h