- turned -devel package into a meta package, which now requires

all the previously required packages by adding the appropriate 
  pkgconfig(...) Requires

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=190
This commit is contained in:
Stefan Dirsch 2012-02-14 11:26:15 +00:00 committed by Git OBS Bridge
parent 90d6d9feb2
commit 15899f93a4
2 changed files with 118 additions and 15 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Feb 14 11:18:00 UTC 2012 - sndirsch@suse.com
- turned -devel package into a meta package, which now requires
all the previously required packages by adding the appropriate
pkgconfig(...) Requires
-------------------------------------------------------------------
Fri Feb 10 16:18:29 UTC 2012 - sndirsch@suse.com

View File

@ -17,11 +17,11 @@
# norootforbuild
%define dummy 0
%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
%if !%{dummy}
%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)
@ -84,17 +84,113 @@ This package contains the remaining X.Org libraries.
License: GPL-2.0+ ; MIT
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
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
# 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: xorg-x11-libxcb-devel
Requires: libpciaccess0-devel libpixman-1-0-devel
AutoReqProv: on
%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)
%endif
%description -n xorg-x11-devel
This package contains all necessary include files and libraries needed
@ -102,7 +198,7 @@ to develop X11 applications that require these.
%prep
%setup -q -T -c %{name}
%if !%{dummy}
%if !%{meta}
for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
pushd libXft-*/src
%patch2 -p1
@ -117,11 +213,11 @@ pushd libXfont-*
%patch11 -p1
popd
%else
touch dummy
touch meta
%endif
%build
%if !%{dummy}
%if !%{meta}
for dir in $(ls); do
pushd $dir
case $dir in
@ -140,7 +236,7 @@ done
%endif
%install
%if !%{dummy}
%if !%{meta}
for dir in $(ls); do
pushd $dir
make install DESTDIR=$RPM_BUILD_ROOT
@ -180,8 +276,8 @@ rm -rf "$RPM_BUILD_ROOT"
%files
%defattr(-,root,root)
%if %{dummy}
%doc dummy
%if %{meta}
%doc meta
%else
/usr/include/X11/bitmaps/
/usr/include/X11/pixmaps/
@ -190,8 +286,8 @@ rm -rf "$RPM_BUILD_ROOT"
%files -n xorg-x11-devel
%defattr(-,root,root)
%if %{dummy}
%doc dummy
%if %{meta}
%doc meta
%else
%doc /usr/share/doc/*
/usr/include/X11/*.h