From def8bb6788c444aa1d95ac551b473af41fd08213548919fadfbda78dbbf494ab Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 24 Feb 2012 09:38:10 +0000 Subject: [PATCH] Accepting request 106770 from home:coolo:branches:openSUSE:Factory - there is no value in manually adding the pkgconfig provides of package names we already know (bnc#748486) The pkgconfig provides of random X libraries can change at any time and it would be necessary to touch this meta package without any additional gain. OBS-URL: https://build.opensuse.org/request/show/106770 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=196 --- xorg-x11-libs.changes | 9 ++ xorg-x11-libs.spec | 227 ++++++++++++++---------------------------- 2 files changed, 85 insertions(+), 151 deletions(-) diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index fbf492d..24b5498 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Feb 24 08:13:02 UTC 2012 - coolo@suse.com + +- there is no value in manually adding the pkgconfig provides of + package names we already know (bnc#748486) + The pkgconfig provides of random X libraries can change at any + time and it would be necessary to touch this meta package without + any additional gain. + ------------------------------------------------------------------- Mon Feb 20 13:12:39 UTC 2012 - sndirsch@suse.com diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 608fbe1..1b6d5ae 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -49,11 +49,19 @@ BuildRequires: xorg-x11-util-devel BuildRequires: xorg-x11-xtrans-devel %if !%{meta} %ifarch ppc64 s390x x86_64 -Provides: libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit) -Provides: libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit) +Provides: libXaw.so.6()(64bit) +Provides: libXaw.so.7()(64bit) +Provides: libXaw.so.8()(64bit) +Provides: libXaw6.so.6()(64bit) +Provides: libXaw7.so.7()(64bit) +Provides: libXaw8.so.8()(64bit) %else -Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6 -Provides: libXaw8.so.8 libXaw7.so.7 libXaw6.so.6 +Provides: libXaw.so.6 +Provides: libXaw.so.7 +Provides: libXaw.so.8 +Provides: libXaw6.so.6 +Provides: libXaw7.so.7 +Provides: libXaw8.so.8 %endif %endif # bug437293 @@ -64,7 +72,7 @@ Obsoletes: xorg-x11-libs-64bit Url: http://xorg.freedesktop.org/ Version: 7.6 Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Remaining X.Org libraries License: GPL-2.0+ ; MIT Group: System/Libraries @@ -109,157 +117,74 @@ This package contains the remaining X.Org libraries. %package -n xorg-x11-devel Summary: Include Files and Libraries mandatory for X11 Development Group: Development/Libraries/X11 -%if !%{meta} -Provides: xorg-x11-compat70-devel xorg-x11-man XFree86-devel -Obsoletes: xorg-x11-compat70-devel xorg-x11-man +Provides: XFree86-devel +Provides: xorg-x11-compat70-devel +Provides: xorg-x11-man +Obsoletes: xorg-x11-compat70-devel +Obsoletes: xorg-x11-man # bug437293 %ifarch ppc64 Obsoletes: xorg-x11-devel-64bit %endif -Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXt-devel xorg-x11-libXmu-devel xorg-x11-libXfixes-devel xorg-x11-libxkbfile-devel freetype2-devel fontconfig-devel %{name} = %{version} xorg-x11-util-devel xorg-x11-libfontenc-devel xorg-x11-libXv-devel xorg-x11-libXprintUtil-devel xorg-x11-fonts-devel pkgconfig libXi6-devel +Requires: %{name} = %{version} +Requires: Mesa-libEGL-devel +Requires: Mesa-libGL-devel +Requires: fontconfig-devel +Requires: freetype2-devel +Requires: libFS-devel +Requires: libICE-devel +Requires: libSM-devel +Requires: libWindowsWM-devel +Requires: libX11-devel +Requires: libXScrnSaver-devel +Requires: libXTrap-devel +Requires: libXau-devel +Requires: libXaw-devel +Requires: libXcliplist-devel +Requires: libXcomposite-devel +Requires: libXcursor-devel +Requires: libXdamage-devel +Requires: libXdmcp-devel +Requires: libXevie-devel +Requires: libXext-devel +Requires: libXfixes-devel +Requires: libXfont-devel +Requires: libXfontcache-devel +Requires: libXft-devel +Requires: libXi-devel +Requires: libXi6-devel +Requires: libXinerama-devel +Requires: libXmu-devel +Requires: libXp-devel +Requires: libXpm-devel +Requires: libXprintAppUtil-devel +Requires: libXprintUtil-devel +Requires: libXrandr-devel +Requires: libXrender-devel +Requires: libXres-devel +Requires: libXt-devel +Requires: libXtst-devel +Requires: libXv-devel +Requires: libXvMC-devel +Requires: libXxf86dga-devel +Requires: libXxf86misc-devel +Requires: libXxf86vm-devel +Requires: libdmx-devel +Requires: libfontenc-devel +Requires: liboldX-devel +Requires: libpciaccess0-devel +Requires: libpixman-1-0-devel +Requires: libvnc-devel +Requires: libxcb-devel +Requires: libxkbfile-devel +Requires: libxkbui-devel +Requires: pkgconfig +Requires: xcb-util-devel Requires: xorg-x11-libxcb-devel -Requires: libpciaccess0-devel libpixman-1-0-devel -%else -Requires: freetype2-devel -Requires: fontconfig-devel -Requires: pkgconfig -Requires: pkgconfig(applewmproto) -Requires: pkgconfig(bigreqsprot) -Requires: pkgconfig(bigreqsproto) -Requires: pkgconfig(compositeproto) -Requires: pkgconfig(damageproto) -Requires: pkgconfig(dmxproto) -Requires: pkgconfig(dri2proto) -Requires: pkgconfig(evieext) -Requires: pkgconfig(evieproto) -Requires: pkgconfig(fixesproto) -Requires: pkgconfig(fontcacheproto) -Requires: pkgconfig(fontenc) -Requires: pkgconfig(fontsproto) -Requires: pkgconfig(fontutil) -Requires: pkgconfig(glproto) -Requires: pkgconfig(ice) -Requires: pkgconfig(inputproto) -Requires: pkgconfig(kbproto) -Requires: pkgconfig(libpthread-stubs) -Requires: pkgconfig(pciaccess) -Requires: pkgconfig(pixman-1) -Requires: pkgconfig(printproto) -Requires: pkgconfig(pthread-stubs) -Requires: pkgconfig(randrproto) -Requires: pkgconfig(recordproto) -Requires: pkgconfig(renderproto) -Requires: pkgconfig(resourceproto) -Requires: pkgconfig(scrnsaveproto) -Requires: pkgconfig(scrnsaverproto) -Requires: pkgconfig(sm) -Requires: pkgconfig(trapproto) -Requires: pkgconfig(util-macros) -Requires: pkgconfig(videoproto) -Requires: pkgconfig(vncproto) -Requires: pkgconfig(windowswmproto) -Requires: pkgconfig(x11) -Requires: pkgconfig(x11-xcb) -Requires: pkgconfig(x86bigfontproto) -Requires: pkgconfig(xau) -Requires: pkgconfig(xcb) -Requires: pkgconfig(xcb-composite) -Requires: pkgconfig(xcb-damage) -Requires: pkgconfig(xcb-dpms) -Requires: pkgconfig(xcb-dri2) -Requires: pkgconfig(xcb-glx) -Requires: pkgconfig(xcb-proto) -Requires: pkgconfig(xcb-randr) -Requires: pkgconfig(xcb-record) -Requires: pkgconfig(xcb-render) -Requires: pkgconfig(xcb-res) -Requires: pkgconfig(xcb-screensaver) -Requires: pkgconfig(xcb-shape) -Requires: pkgconfig(xcb-shm) -Requires: pkgconfig(xcb-sync) -Requires: pkgconfig(xcb-xevie) -Requires: pkgconfig(xcb-xf86dri) -Requires: pkgconfig(xcb-xfixes) -Requires: pkgconfig(xcb-xinerama) -Requires: pkgconfig(xcb-xprint) -Requires: pkgconfig(xcb-xtest) -Requires: pkgconfig(xcb-xv) -Requires: pkgconfig(xcb-xvmc) -Requires: pkgconfig(xcliplistproto) -Requires: pkgconfig(xcmiscproto) -Requires: pkgconfig(xdmcp) -Requires: pkgconfig(xext) -Requires: pkgconfig(xextproto) -Requires: pkgconfig(xf86bigfontproto) -Requires: pkgconfig(xf86dgaproto) -Requires: pkgconfig(xf86driproto) -Requires: pkgconfig(xf86miscproto) -Requires: pkgconfig(xf86rushproto) -Requires: pkgconfig(xf86vidmodeproto) -Requires: pkgconfig(xfixes) -Requires: pkgconfig(xi) -Requires: pkgconfig(xineramaproto) -Requires: pkgconfig(xkbfile) -Requires: pkgconfig(xmu) -Requires: pkgconfig(xmuu) -Requires: pkgconfig(xorg-macros) -Requires: pkgconfig(xorg-sgml-doctools) -Requires: pkgconfig(xp) -Requires: pkgconfig(xpm) -Requires: pkgconfig(xprintutil) -Requires: pkgconfig(xproto) -Requires: pkgconfig(xproxymanagementprotocol) -Requires: pkgconfig(xproxymngproto) -Requires: pkgconfig(xrender) -Requires: pkgconfig(xt) -Requires: pkgconfig(xtrans) -Requires: pkgconfig(xv) -Requires: pkgconfig(xaw6) -Requires: pkgconfig(xaw7) -Requires: pkgconfig(dmx) -Requires: pkgconfig(lbxutil) -Requires: pkgconfig(libfs) -Requires: pkgconfig(oldx) -Requires: pkgconfig(vnc) -Requires: pkgconfig(windowswm) -Requires: pkgconfig(xbitmaps) -Requires: pkgconfig(xcb-atom) -Requires: pkgconfig(xcb-aux) -Requires: pkgconfig(xcb-event) -%if %suse_version > 1210 -Requires: pkgconfig(xcb-util) -%else -Requires: pkgconfig(xcb-atom) -Requires: pkgconfig(xcb-aux) -Requires: pkgconfig(xcb-event) -Requires: pkgconfig(xcb-icccm) -Requires: pkgconfig(xcb-image) -Requires: pkgconfig(xcb-keysyms) -Requires: pkgconfig(xcb-property) -Requires: pkgconfig(xcb-renderutil) -Requires: pkgconfig(xcb-reply) -%endif -Requires: pkgconfig(xcliplist) -Requires: pkgconfig(xcomposite) -Requires: pkgconfig(xcursor) -Requires: pkgconfig(xdamage) -Requires: pkgconfig(xevie) -Requires: pkgconfig(xfont) -Requires: pkgconfig(xfontcache) -Requires: pkgconfig(xft) -Requires: pkgconfig(xinerama) -Requires: pkgconfig(xkbui) -Requires: pkgconfig(xprintapputil) -Requires: pkgconfig(xrandr) -Requires: pkgconfig(xres) -Requires: pkgconfig(xscrnsaver) -Requires: pkgconfig(xtrap) -Requires: pkgconfig(xtst) -Requires: pkgconfig(xvmc) -Requires: pkgconfig(xxf86dga) -Requires: pkgconfig(xxf86misc) -Requires: pkgconfig(xxf86vm) -%endif +Requires: xorg-x11-libxkbfile-devel +Requires: xorg-x11-proto-devel +Requires: xorg-x11-util-devel +Requires: xorg-x11-xtrans-devel %description -n xorg-x11-devel This package contains all necessary include files and libraries needed