diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index f7d6c5b..1462c0e 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 18 06:34:19 UTC 2012 - coolo@suse.com + +- readd all the devel libs lost during the split as pkgconfig requires + ------------------------------------------------------------------- Tue Feb 14 11:18:00 UTC 2012 - sndirsch@suse.com diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 3e1c1e7..5742623 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -15,12 +15,38 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define meta 1 Name: xorg-x11-libs -BuildRequires: fdupes fontconfig-devel freetype2-devel gperf libXi6-devel libexpat-devel libtool libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel +BuildRequires: fdupes +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel +BuildRequires: gperf +BuildRequires: libXi6-devel +BuildRequires: libexpat-devel +BuildRequires: libtool +BuildRequires: libxslt +BuildRequires: pkgconfig +BuildRequires: xorg-x11-libICE-devel +BuildRequires: xorg-x11-libSM-devel +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXau-devel +BuildRequires: xorg-x11-libXdmcp-devel +BuildRequires: xorg-x11-libXext-devel +BuildRequires: xorg-x11-libXfixes-devel +BuildRequires: xorg-x11-libXmu-devel +BuildRequires: xorg-x11-libXp-devel +BuildRequires: xorg-x11-libXpm-devel +BuildRequires: xorg-x11-libXprintUtil-devel +BuildRequires: xorg-x11-libXrender-devel +BuildRequires: xorg-x11-libXt-devel +BuildRequires: xorg-x11-libXv-devel +BuildRequires: xorg-x11-libfontenc-devel +BuildRequires: xorg-x11-libxkbfile-devel +BuildRequires: xorg-x11-proto-devel +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) @@ -37,11 +63,11 @@ Obsoletes: xorg-x11-libs-64bit # Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 23 -License: GPL-2.0+ ; MIT +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: System/Libraries Summary: Remaining X.Org libraries +License: GPL-2.0+ ; MIT +Group: System/Libraries Source1: libFS-1.0.3.tar.bz2 Source2: libWindowsWM-1.0.1.tar.bz2 Source3: libXScrnSaver-1.2.1.tar.bz2 @@ -81,7 +107,6 @@ Patch11: U_libXfont_LZW-decompress-fix-for-CVE-2011-2895.patch This package contains the remaining X.Org libraries. %package -n xorg-x11-devel -License: GPL-2.0+ ; MIT Summary: Include Files and Libraries mandatory for X11 Development Group: Development/Libraries/X11 %if !%{meta} @@ -94,7 +119,6 @@ Obsoletes: xorg-x11-devel-64bit 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: xorg-x11-libxcb-devel Requires: libpciaccess0-devel libpixman-1-0-devel -AutoReqProv: on %else Requires: freetype2-devel Requires: fontconfig-devel @@ -190,6 +214,39 @@ 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) +Requires: pkgconfig(xcb-util) +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 %description -n xorg-x11-devel