From f1bb566c9205addfa56a2d12ef0f0030831b7788ebdaac85a4d56b0e7635a99b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 22 Mar 2014 09:36:37 +0000 Subject: [PATCH] Accepting request 227099 from home:coolo:branches:openSUSE:Factory - obsolete glamor-devel from the correct package OBS-URL: https://build.opensuse.org/request/show/227099 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=503 --- xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index abd66cd..732abeb 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 22 07:02:56 UTC 2014 - coolo@suse.com + +- obsolete glamor-devel from the correct package + ------------------------------------------------------------------- Fri Mar 21 09:40:03 UTC 2014 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 87a65e2..51bd40c 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -112,10 +112,8 @@ Obsoletes: xorg-x11-Xvfb Obsoletes: xorg-x11-server-glx Provides: glamor = %{version} -Provides: glamor-devel = %{version} Provides: glamor-egl = %{version} Obsoletes: glamor < %{version} -Obsoletes: glamor-devel < %{version} Obsoletes: glamor-egl < %{version} # Xvfb requires keyboard files as well (bnc#797124) @@ -188,6 +186,8 @@ Requires: pkgconfig(xtrans) Requires: pkgconfig(xv) Provides: xorg-x11-sdk Obsoletes: xorg-x11-sdk +Provides: glamor-devel = %{version} +Obsoletes: glamor-devel < %{version} %description sdk This package contains the X.Org Server SDK.