From f090206a3f0cd45d92274fbdeefc0c48ae4ba3a433bb56ef81ced913787dec59 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 21 Oct 2019 09:43:44 +0000 Subject: [PATCH] Accepting request 741341 from home:StefanBruens:branches:X11:XOrg - Add conflicts for old xorgproto-devel, X11/extensions/XKBgeom.h was moved to libX11-devel. OBS-URL: https://build.opensuse.org/request/show/741341 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libX11?expand=0&rev=54 --- libX11.changes | 6 ++++++ libX11.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/libX11.changes b/libX11.changes index 387eccc..35e08e5 100644 --- a/libX11.changes +++ b/libX11.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 20 18:27:32 UTC 2019 - Stefan Brüns + +- Add conflicts for old xorgproto-devel, X11/extensions/XKBgeom.h + was moved to libX11-devel. + ------------------------------------------------------------------- Wed Oct 9 22:33:27 UTC 2019 - Stefan Dirsch diff --git a/libX11.spec b/libX11.spec index 403332e..54c5f32 100644 --- a/libX11.spec +++ b/libX11.spec @@ -111,6 +111,8 @@ Requires: libX11-xcb1 = %{version} # O/P added for 12.2 Provides: xorg-x11-libX11-devel = 7.6_%{version}-%{release} Obsoletes: xorg-x11-libX11-devel < 7.6_%{version}-%{release} +Conflicts: xorgproto-devel < 2019.2 +Provides: xorgproto-devel:%{_includedir}/X11/extensions/XKBgeom.h %description devel The X Window System is a network-transparent window system that was