diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index 64d9485..cc14594 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +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 + +- 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 a8476d4..b1420bc 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 @@ -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,8 +42,10 @@ Group: Development/Libraries/X11 Provides: XFree86-devel Provides: xorg-x11-compat70-devel Provides: xorg-x11-man +Provides: xorg-x11-util-devel = 7.6.1 Obsoletes: xorg-x11-compat70-devel Obsoletes: xorg-x11-man +Obsoletes: xorg-x11-util-devel < 7.6.1 # bug437293 %ifarch ppc64 Obsoletes: xorg-x11-devel-64bit @@ -107,8 +109,15 @@ 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) +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