From beb465f0125f85112ec9656ee0fff7039f3b0471 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 14 Jul 2020 02:08:04 +0000 Subject: [PATCH] import xorg-x11-proto-devel-2020.1-3.el8 --- SPECS/xorg-x11-proto-devel.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/SPECS/xorg-x11-proto-devel.spec b/SPECS/xorg-x11-proto-devel.spec index df6a6db..874b38b 100644 --- a/SPECS/xorg-x11-proto-devel.spec +++ b/SPECS/xorg-x11-proto-devel.spec @@ -6,7 +6,7 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 2020.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://www.x.org BuildArch: noarch @@ -48,6 +48,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg} # from this package until we rebase libXxf86misc again. install -p include/X11/extensions/xf86m* $RPM_BUILD_ROOT%{_includedir}/X11/extensions install -p xf86miscproto.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig +# temporary workaround for 8.3, we need to keep shipping XKBgeom.h +# from this package until we rebase libX11 again. +install -p include/X11/extensions/XKBgeom.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions %files %doc COPYING-* @@ -154,6 +157,7 @@ install -p xf86miscproto.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig %{_includedir}/X11/extensions/syncconst.h %{_includedir}/X11/extensions/syncproto.h %{_includedir}/X11/extensions/syncstr.h +%{_includedir}/X11/extensions/XKBgeom.h %{_includedir}/X11/extensions/xcmiscproto.h %{_includedir}/X11/extensions/xcmiscstr.h %{_includedir}/X11/extensions/xf86bigfont.h @@ -217,6 +221,9 @@ install -p xf86miscproto.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig %{_docdir}/xorgproto/* %changelog +* Mon Jun 08 2020 Peter Hutterer 2020.1-3 +- Ship XKBgeom.h from this package until libX11 is rebased + * Tue Jun 02 2020 Adam Jackson - 2020.1-2 - xorgproto 2020.1