pool/xorg-x11-libs
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 105540 from X11:XOrg

Browse Source 
- turned -devel package into a meta package, which now requires
  all the previously required packages by adding the appropriate 
  pkgconfig(...) Requires

- back to real libs package, but no longer preferred in project 

- please rebuild !!! 

- no longer package anything, since libs are now packaged
  seperately ==> dummy package

- instead of using LD_PRELOAD link the fake libs against the
  freshly introduced libxcb-util; hope this works out ...
  Still this does not help on openSuSE 11.4 (bnc#742297)

- still we need a LD_PRELOAD for the freshly introduced libxcb-util;
  added this to /etc/profile.d/xorg-x11-libs.{csh,sh}; seems to
  help on openSUSE 12.1, but apparently not on openSUSE 11.4 
  (bnc #742297)

OBS-URL: https://build.opensuse.org/request/show/105540
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-libs?expand=0&rev=116
This commit is contained in:
Stephan Kulow 2012-02-17 11:17:12 +00:00 committed by Git OBS Bridge
commit 54a9a50320
2 changed files with 159 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
xorg-x11-libs.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
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
- back to real libs package, but no longer preferred in project
-------------------------------------------------------------------
Thu Feb 9 15:26:18 UTC 2012 - sndirsch@suse.com
- please rebuild !!!
-------------------------------------------------------------------
Thu Feb 9 14:28:07 UTC 2012 - sndirsch@suse.com
- no longer package anything, since libs are now packaged
seperately ==> dummy package
-------------------------------------------------------------------
Tue Feb 7 16:58:55 UTC 2012 - sndirsch@suse.com
- instead of using LD_PRELOAD link the fake libs against the
freshly introduced libxcb-util; hope this works out ...
Still this does not help on openSuSE 11.4 (bnc#742297)
-------------------------------------------------------------------
Fri Feb 3 10:14:23 UTC 2012 - sndirsch@suse.com
- still we need a LD_PRELOAD for the freshly introduced libxcb-util;
added this to /etc/profile.d/xorg-x11-libs.{csh,sh}; seems to
help on openSUSE 12.1, but apparently not on openSUSE 11.4
(bnc #742297)
-------------------------------------------------------------------
Mon Jan 23 10:59:06 UTC 2012 - sndirsch@suse.com

126
xorg-x11-libs.spec
View File

@ -17,9 +17,11 @@
# 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
%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)
@ -27,6 +29,7 @@ Provides: libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit
Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6
Provides: libXaw8.so.8 libXaw7.so.7 libXaw6.so.6
%endif
%endif
# bug437293
%ifarch ppc64
Obsoletes: xorg-x11-libs-64bit
@ -81,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
@ -99,6 +198,7 @@ to develop X11 applications that require these.
%prep
%setup -q -T -c %{name}
%if !%{meta}
for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
pushd libXft-*/src
%patch2 -p1
@ -112,8 +212,12 @@ popd
pushd libXfont-*
%patch11 -p1
popd
%else
touch meta
%endif
%build
%if !%{meta}
for dir in $(ls); do
pushd $dir
case $dir in
@ -129,8 +233,10 @@ for dir in $(ls); do
%{__make} %{?_smp_mflags}
popd
done
%endif
%install
%if !%{meta}
for dir in $(ls); do
pushd $dir
make install DESTDIR=$RPM_BUILD_ROOT
@ -152,12 +258,14 @@ for ext_version in atom:1 aux:0 event:1 icccm:1 image:0 keysyms:1 property:1 ren
> xcb-${ext}.c
gcc -Wall -ansi -pedantic -c xcb-${ext}.c -fPIC
gcc -shared -Wl,-soname,libxcb-${ext}.so.${version} \
-Wl,-L$RPM_BUILD_ROOT%{_libdir},--no-as-needed,-lxcb-util \
-o $RPM_BUILD_ROOT%{_libdir}/libxcb-${ext}.so.${version} xcb-${ext}.o
done
%if %suse_version > 1110
%{__rm} -f %{buildroot}%{_libdir}/*.la
%endif
%fdupes -s $RPM_BUILD_ROOT/%_mandir
%endif
%clean
rm -rf "$RPM_BUILD_ROOT"
@ -168,12 +276,19 @@ rm -rf "$RPM_BUILD_ROOT"
%files
%defattr(-,root,root)
%if %{meta}
%doc meta
%else
/usr/include/X11/bitmaps/
/usr/include/X11/pixmaps/
/usr/%{_lib}/*.so.*
%endif
%files -n xorg-x11-devel
%defattr(-,root,root)
%if %{meta}
%doc meta
%else
%doc /usr/share/doc/*
/usr/include/X11/*.h
/usr/include/X11/Xaw/
@ -193,5 +308,6 @@ rm -rf "$RPM_BUILD_ROOT"
%doc %{_datadir}/doc/libXvMC/
%doc %{_datadir}/doc/libXaw/
%doc %{_datadir}/doc/libFS/
%endif
%changelog