From a0727a1d9bb9cdcfc6ca7f20b53058a5c5831b79 Mon Sep 17 00:00:00 2001 From: songnannan Date: Tue, 14 Jan 2020 23:07:47 +0800 Subject: [PATCH 1/2] delete isa in obsoletes --- xorg-x11-server.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 0485fd3..bd45688 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -16,7 +16,7 @@ Name: xorg-x11-server Version: 1.20.6 -Release: 1 +Release: 2 Summary: X.Org X11 X server License: MIT and GPLv2 URL: https://www.x.org @@ -55,8 +55,7 @@ Requires: pixman >= 0.30.0 xkeyboard-config xkbcomp Requires: system-setup-keyboard xorg-x11-drv-libinput libEGL Requires: xorg-x11-xauth - -Obsoletes: %{name}-common %{name}-Xorg %{name}-Xorg%{?_isa} %{name}-Xnest %{name}-source %{name}-Xdmx %{name}-Xvfb %{name}-Xwayland +Obsoletes: %{name}-common %{name}-Xorg %{name}-Xorg %{name}-Xnest %{name}-source %{name}-Xdmx %{name}-Xvfb %{name}-Xwayland Provides: %{name}-common %{name}-Xorg %{name}-Xorg%{?_isa} %{name}-Xnest %{name}-source %{name}-Xdmx %{name}-Xvfb %{name}-Xwayland %{name}-Xwayland%{?_isa} Provides: Xorg = %{version}-%{release} @@ -267,6 +266,12 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_libdir}/xorg/protocol.txt %changelog +* Tue Jan 14 2020 openEuler Buildteam - 1.20.6-2 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:delete the isa in Obsoletes + * Sat Jan 11 2020 openEuler Buildteam - 1.20.6-1 - Type:enhancement - Id:NA -- Gitee From 21af593fee75baa502c4826bc11ed2547ddfa07f Mon Sep 17 00:00:00 2001 From: songnannan Date: Tue, 14 Jan 2020 23:08:35 +0800 Subject: [PATCH 2/2] delete isa in obsoletes --- xorg-x11-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index bd45688..9e8bf53 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -55,7 +55,7 @@ Requires: pixman >= 0.30.0 xkeyboard-config xkbcomp Requires: system-setup-keyboard xorg-x11-drv-libinput libEGL Requires: xorg-x11-xauth -Obsoletes: %{name}-common %{name}-Xorg %{name}-Xorg %{name}-Xnest %{name}-source %{name}-Xdmx %{name}-Xvfb %{name}-Xwayland +Obsoletes: %{name}-common %{name}-Xorg %{name}-Xnest %{name}-source %{name}-Xdmx %{name}-Xvfb %{name}-Xwayland Provides: %{name}-common %{name}-Xorg %{name}-Xorg%{?_isa} %{name}-Xnest %{name}-source %{name}-Xdmx %{name}-Xvfb %{name}-Xwayland %{name}-Xwayland%{?_isa} Provides: Xorg = %{version}-%{release} -- Gitee