From e8e43ee9106262655c88b3413fac7b7142c3af34cee55cfb3bc50091ed9d3e0c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 29 Jan 2018 12:40:23 +0000 Subject: [PATCH 1/3] - Directly require packages, which were required by xorg-x11-util-devel meta package (bsc#1077489) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=210 --- xorg-x11-libs.changes | 6 ++++++ xorg-x11-libs.spec | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index 64d9485..57be6ff 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 29 11:28:16 UTC 2018 - sndirsch@suse.com + +- Directly require packages, which were required by xorg-x11-util-devel + meta package (bsc#1077489) + ------------------------------------------------------------------- Sat May 3 10:25:41 UTC 2014 - sndirsch@suse.com diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index a8476d4..1c34cad 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -109,6 +109,14 @@ Requires: xorg-x11-libxcb-devel Requires: xorg-x11-libxkbfile-devel Requires: xorg-x11-util-devel Requires: xorg-x11-xtrans-devel +# Directly require packages, which were required by xorg-x11-util-devel +# meta package (bsc#1077489) +Requires: gccmakedep +Requires: imake +Requires: lndir +Requires: makedepend +Requires: xorg-cf-files +Requires: xorg-sgml-doctools %description -n xorg-x11-devel This package is a compatibility metapackage. It used to contain the From 2c2bb227cb958512a92f705cdebf182c08a86a7d77c7864c6602945b1ee2e9f3 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 29 Jan 2018 14:55:53 +0000 Subject: [PATCH 2/3] - Directly require packages, which were required by xorg-x11-util-devel meta package; provide/obsolete xorg-x11-util-devel now (bsc#1077489) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=211 --- xorg-x11-libs.changes | 5 +++-- xorg-x11-libs.spec | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index 57be6ff..0b62104 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Mon Jan 29 11:28:16 UTC 2018 - sndirsch@suse.com -- Directly require packages, which were required by xorg-x11-util-devel - meta package (bsc#1077489) +- Directly require packages, which were required by + xorg-x11-util-devel meta package; provide/obsolete + xorg-x11-util-devel now (bsc#1077489) ------------------------------------------------------------------- Sat May 3 10:25:41 UTC 2014 - sndirsch@suse.com diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 1c34cad..7de1e2e 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-libs # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,8 +42,10 @@ Group: Development/Libraries/X11 Provides: XFree86-devel Provides: xorg-x11-compat70-devel Provides: xorg-x11-man +Provides: xorg-x11-util-devel Obsoletes: xorg-x11-compat70-devel Obsoletes: xorg-x11-man +Obsoletes: xorg-x11-util-devel # bug437293 %ifarch ppc64 Obsoletes: xorg-x11-devel-64bit @@ -107,7 +109,6 @@ Requires: xcb-util-0_3_6-devel Requires: xorg-x11-fonts-devel Requires: xorg-x11-libxcb-devel Requires: xorg-x11-libxkbfile-devel -Requires: xorg-x11-util-devel Requires: xorg-x11-xtrans-devel # Directly require packages, which were required by xorg-x11-util-devel # meta package (bsc#1077489) From 7bd8ff439fdc8268d9bdd9b4d1c22cf1585afc33fc791e1fbb43cb089ddd1863 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 31 Jan 2018 16:36:21 +0000 Subject: [PATCH 3/3] - raised version number of package; improved definitions for provide/obsolete of xorg-x11-util-devel so makedepend, lndir, gccmakedep, xorg-cf-files and xorg-sgml-doctools no longer conflict with xorg-x11-devel package (bsc#1077489) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=212 --- xorg-x11-libs.changes | 8 ++++++++ xorg-x11-libs.spec | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index 0b62104..cc14594 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 31 16:31:43 UTC 2018 - sndirsch@suse.com + +- raised version number of package; improved definitions for + provide/obsolete of xorg-x11-util-devel so makedepend, lndir, + gccmakedep, xorg-cf-files and xorg-sgml-doctools no longer + conflict with xorg-x11-devel package (bsc#1077489) + ------------------------------------------------------------------- Mon Jan 29 11:28:16 UTC 2018 - sndirsch@suse.com diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 7de1e2e..b1420bc 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -17,7 +17,7 @@ Name: xorg-x11-libs -Version: 7.6 +Version: 7.6.1 Release: 0 Summary: Compatibility metapackage for X.Org libraries License: GPL-2.0+ and MIT @@ -42,10 +42,10 @@ Group: Development/Libraries/X11 Provides: XFree86-devel Provides: xorg-x11-compat70-devel Provides: xorg-x11-man -Provides: xorg-x11-util-devel +Provides: xorg-x11-util-devel = 7.6.1 Obsoletes: xorg-x11-compat70-devel Obsoletes: xorg-x11-man -Obsoletes: xorg-x11-util-devel +Obsoletes: xorg-x11-util-devel < 7.6.1 # bug437293 %ifarch ppc64 Obsoletes: xorg-x11-devel-64bit