From 9d868c402df56d526006b305c861953974486fe3dd8b37a758e2db5431cf390d Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 3 Feb 2012 13:38:07 +0000
Subject: [PATCH] - 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/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=184
---
 xorg-x11-libs.changes |  8 ++++++++
 xorg-x11-libs.csh     |  7 +++++++
 xorg-x11-libs.sh      |  6 ++++++
 xorg-x11-libs.spec    | 13 +++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 xorg-x11-libs.csh
 create mode 100644 xorg-x11-libs.sh

diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index 98ee5ec..483066b 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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
 
diff --git a/xorg-x11-libs.csh b/xorg-x11-libs.csh
new file mode 100644
index 0000000..27a2e46
--- /dev/null
+++ b/xorg-x11-libs.csh
@@ -0,0 +1,7 @@
+# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
+if ( ${?LD_PRELOAD} ) then
+        setenv LD_PRELOAD "${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
+else
+        setenv LD_PRELOAD /usr/lib64/libxcb-util.so.0
+endif
+
diff --git a/xorg-x11-libs.sh b/xorg-x11-libs.sh
new file mode 100644
index 0000000..f2d73bb
--- /dev/null
+++ b/xorg-x11-libs.sh
@@ -0,0 +1,6 @@
+# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
+if [ -z "$LD_PRELOAD" ]; then
+        export LD_PRELOAD=/usr/lib64/libxcb-util.so.0
+else
+        export LD_PRELOAD="${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
+fi
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index dcabe39..6bfe603 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -69,6 +69,8 @@ Source29:       libvnc-20070501.tar.bz2
 Source30:       libXcliplist-20070501.tar.bz2
 Source31:       xcb-util-0.3.8.tar.bz2
 Source90:       baselibs.conf
+Source91:       xorg-x11-libs.sh
+Source92:       xorg-x11-libs.csh
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
@@ -154,6 +156,12 @@ for ext_version in atom:1 aux:0 event:1 icccm:1 image:0 keysyms:1 property:1 ren
   gcc -shared -Wl,-soname,libxcb-${ext}.so.${version} \
       -o $RPM_BUILD_ROOT%{_libdir}/libxcb-${ext}.so.${version} xcb-${ext}.o
 done
+%if %suse_version < 1220
+# still we need a LD_PRELOAD for the freshly introduced libxcb-util
+# (bnc #742297)
+mkdir -p $RPM_BUILD_ROOT/etc/profile.d/
+install -m 644 %{SOURCE91} %{SOURCE92} $RPM_BUILD_ROOT/etc/profile.d/
+%endif
 %if %suse_version > 1110
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %endif
@@ -168,6 +176,11 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
+%if %suse_version < 1220
+%dir /etc/profile.d
+/etc/profile.d/xorg-x11-libs.csh
+/etc/profile.d/xorg-x11-libs.sh
+%endif
 /usr/include/X11/bitmaps/
 /usr/include/X11/pixmaps/
 /usr/%{_lib}/*.so.*