[cairo] Fix a multilib issue

[Matthias Clasen]

commit 01ecaf41ffd7cb83b52bf403aba921449aa89b5f
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Jul 18 16:05:17 2013 -0400

    Fix a multilib issue

 cairo-multilib.patch |   34 ++++++++++++++++++++++++++++++++++
 cairo.spec           |    7 ++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/cairo-multilib.patch b/cairo-multilib.patch
new file mode 100644
index 0000000..16fd96b
--- /dev/null
+++ b/cairo-multilib.patch
@@ -0,0 +1,34 @@
+diff -up cairo-1.12.14/util/cairo-trace/cairo-trace.in.multilib cairo-1.12.14/util/cairo-trace/cairo-trace.in
+--- cairo-1.12.14/util/cairo-trace/cairo-trace.in.multilib	2013-07-18 16:03:38.044832193 -0400
++++ cairo-1.12.14/util/cairo-trace/cairo-trace.in	2013-07-18 16:03:43.981882777 -0400
+@@ -2,6 +2,12 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
++case `uname -m` in
++  x86_64|s390x|ppc64) libdir=@prefix@/lib64
++    ;;
++  *) libdir=@prefix@/lib
++    ;;
++esac
+ 
+ nofile=
+ flush=
+@@ -90,7 +96,7 @@ export CAIRO_TRACE_PROG_NAME
+ 
+ if test "x$CAIRO_TRACE_SO" = "x"; then
+     CAIRO_TRACE_SO=""
+-    for lib in @libdir@/cairo/libcairo-trace. at SHLIB_EXT@ @libdir@/cairo/libcairo-trace. at SHLIB_EXT@* @libdir@/cairo/libcairo-trace.*. at SHLIB_EXT@ ; do
++    for lib in $libdir/cairo/libcairo-trace. at SHLIB_EXT@ $libdir/cairo/libcairo-trace. at SHLIB_EXT@* $libdir/cairo/libcairo-trace.*. at SHLIB_EXT@ ; do
+ 	if test -h "$lib" -o -f "$lib"; then
+ 	    CAIRO_TRACE_SO="$lib"
+ 	    break
+@@ -98,7 +104,7 @@ if test "x$CAIRO_TRACE_SO" = "x"; then
+     done
+ fi
+ if test "x$CAIRO_TRACE_SO" = "x"; then
+-    echo "Could not find the cairo-trace shared library in @libdir@/cairo/." >&2
++    echo "Could not find the cairo-trace shared library in $libdir/cairo/." >&2
+     echo "Set the CAIRO_TRACE_SO environment variable to the full path of the library." >&2
+     exit 15
+ fi
diff --git a/cairo.spec b/cairo.spec
index 213d312..ac6e390 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -5,7 +5,7 @@
 Summary:	A 2D graphics library
 Name:		cairo
 Version:	1.12.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://cairographics.org
 #VCS:		git:git://git.freedesktop.org/git/cairo
 #Source0:	http://cairographics.org/snapshots/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@ Group:		System Environment/Libraries
 Patch0:		0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch
 Patch1:		0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch
 Patch2:		0003-mempool-Reduce-an-assert-into-an-error-return-for-ge.patch
+Patch3:         cairo-multilib.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libXrender-devel
@@ -98,6 +99,7 @@ This package contains tools for working with the cairo graphics library.
 %patch0 -p1 -b .xlib-swap
 %patch1 -p1 -b .xcb-swap
 %patch2 -p1 -b .get_buddy-assert
+%patch3 -p1 -b .multilib
 
 %build
 %configure --disable-static	\
@@ -181,6 +183,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/cairo/
 
 %changelog
+* Thu Jul 17 2013 Matthias Clasen <mclasen at redhat.com> 1.12.14-3
+- Fix a multilib issue in /usr/bin/cairo-trace
+
 * Sat May 25 2013 Kalev Lember <kalevlember at gmail.com> 1.12.14-2
 - Backport an upstream patch for eog get_buddy() crashes (#912030)