From a9bb42149a82543a83298f146968de95a8600d363d5638d9f9200ea4c7039be9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 29 Jun 2018 08:23:11 +0000 Subject: [PATCH] Accepting request 619635 from home:tobijk:X11:XOrg - Obsolete protocol packages by their corresponding old package names, not by their pkconfig(...) provides. Additionally move the obsoletes to the -devel package to take effect. OBS-URL: https://build.opensuse.org/request/show/619635 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorgproto?expand=0&rev=2 --- xorgproto.changes | 7 +++++ xorgproto.spec | 66 ++++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 32 deletions(-) diff --git a/xorgproto.changes b/xorgproto.changes index 70d3598..6ed80d1 100644 --- a/xorgproto.changes +++ b/xorgproto.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 27 23:07:34 UTC 2018 - tobias.johannes.klausmann@mni.thm.de + +- Obsolete protocol packages by their corresponding old package names, not by + their pkconfig(...) provides. Additionally move the obsoletes to the -devel + package to take effect. + ------------------------------------------------------------------- Wed Feb 28 20:45:12 UTC 2018 - tobias.johannes.klausmann@mni.thm.de diff --git a/xorgproto.spec b/xorgproto.spec index 76fd8e6..72e847a 100644 --- a/xorgproto.spec +++ b/xorgproto.spec @@ -30,37 +30,8 @@ Source: http://xorg.freedesktop.org/releases/individual/proto/%name-%ver BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: pkgconfig(applewmproto) <= 1.4.2 -Obsoletes: pkgconfig(bigreqsproto) <= 1.1.2 -Obsoletes: pkgconfig(compositeproto) <= 0.4.2 -Obsoletes: pkgconfig(damageproto) <= 1.2.1 -Obsoletes: pkgconfig(dmxproto) <= 2.3.1 -Obsoletes: pkgconfig(dri2proto) <= 2.8 -Obsoletes: pkgconfig(dri3proto) <= 1.2 -Obsoletes: pkgconfig(fixesproto) <= 5.0 -Obsoletes: pkgconfig(fontsproto) <= 2.1.3 -Obsoletes: pkgconfig(glproto) <= 1.4.17 -Obsoletes: pkgconfig(inputproto) <= 2.3.2 -Obsoletes: pkgconfig(kbproto) <= 1.0.7 -Obsoletes: pkgconfig(presentproto) <= 1.2 -Obsoletes: pkgconfig(randrproto) <= 1.6.0 -Obsoletes: pkgconfig(recordproto) <= 1.14.2 -Obsoletes: pkgconfig(renderproto) <= 0.11.1 -Obsoletes: pkgconfig(resourceproto) <= 1.2.0 -Obsoletes: pkgconfig(scrnsaverproto) <= 1.2.2 -Obsoletes: pkgconfig(trapproto) <= 3.4.3 -Obsoletes: pkgconfig(videoproto) <= 2.3.3 -Obsoletes: pkgconfig(windowswmproto) <= 1.0.4 -Obsoletes: pkgconfig(xcmiscproto) <= 1.2.2 -Obsoletes: pkgconfig(xextproto) <= 7.3.0 -Obsoletes: pkgconfig(xf86bigfontproto) <= 1.2.0 -Obsoletes: pkgconfig(xf86dgaproto) <= 2.1 -Obsoletes: pkgconfig(xf86driproto) <= 2.1.1 -Obsoletes: pkgconfig(xf86miscproto) <= 0.9.3 -Obsoletes: pkgconfig(xf86vidmodeproto) <= 2.3.1 -Obsoletes: pkgconfig(xineramaproto) <= 1.2.1 -Obsoletes: pkgconfig(xproto) <= 7.0.32 -Obsoletes: pkgconfig(xproxymngproto) <= 1.0.3 + + %description The X11 protocol headers for X11 development. @@ -76,8 +47,39 @@ xproto and xproxymngproto. Summary: The X11 Protocol collection Group: Development/Libraries/X11 -Provides: xorg-x11-proto-devel:%_libdir/pkgconfig/presentproto.pc Obsoletes: xorgproto-devel < %{version} +# the next is for obsoleting applewmproto <= 1.4.2 +Obsoletes: xorg-x11-proto-devel +Obsoletes: bigreqsproto-devel <= 1.1.2 +Obsoletes: compositeproto-devel <= 0.4.2 +Obsoletes: damageproto-devel <= 1.2.1 +Obsoletes: dmxproto-devel <= 2.3.1 +Obsoletes: dri2proto-devel <= 2.8 +Obsoletes: dri3proto-devel <= 1.2 +Obsoletes: fixesproto-devel <= 5.0 +Obsoletes: fontsproto-devel <= 2.1.3 +Obsoletes: glproto-devel <= 1.4.17 +Obsoletes: inputproto-devel <= 2.3.2 +Obsoletes: kbproto-devel <= 1.0.7 +Obsoletes: presentproto-devel <= 1.2 +Obsoletes: randrproto-devel <= 1.6.0 +Obsoletes: recordproto-devel <= 1.14.2 +Obsoletes: renderproto-devel <= 0.11.1 +Obsoletes: resourceproto-devel <= 1.2.0 +Obsoletes: scrnsaverproto-devel <= 1.2.2 +Obsoletes: trapproto-devel <= 3.4.3 +Obsoletes: videoproto-devel <= 2.3.3 +Obsoletes: windowswmproto-devel <= 1.0.4 +Obsoletes: xcmiscproto-devel <= 1.2.2 +Obsoletes: xextproto-devel <= 7.3.0 +Obsoletes: xf86bigfontproto-devel <= 1.2.0 +Obsoletes: xf86dgaproto-devel <= 2.1 +Obsoletes: xf86driproto-devel <= 2.1.1 +Obsoletes: xf86miscproto-devel <= 0.9.3 +Obsoletes: xf86vidmodeproto-devel <= 2.3.1 +Obsoletes: xineramaproto-devel <= 1.2.1 +Obsoletes: xproto-devel <= 7.0.32 +Obsoletes: xproxymngproto-devel <= 1.0.3 %description devel The compelte X11 protocol headers for X11 development.