From 26c258c1bc52c5140266d681e37e0e66d69791a9 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 22 May 2006 18:13:40 +0000
Subject: [PATCH] - Fixed devel package multilib conflict (bug #192664).

---
 cups-multilib.patch | 15 +++++++++++++++
 cups.spec           |  5 +++++
 2 files changed, 20 insertions(+)
 create mode 100644 cups-multilib.patch

diff --git a/cups-multilib.patch b/cups-multilib.patch
new file mode 100644
index 0000000..2b0f764
--- /dev/null
+++ b/cups-multilib.patch
@@ -0,0 +1,15 @@
+--- cups-1.2.0/cups-config.in.multilib	2006-05-22 19:05:17.000000000 +0100
++++ cups-1.2.0/cups-config.in	2006-05-22 19:06:07.000000000 +0100
+@@ -30,8 +30,10 @@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
+-imagelibdir=@libdir@
++# Fetch libdir from gnutls's pkg-config script.  This is a bit
++# of a cheat, but the cups-devel package requires gnutls-devel anyway.
++libdir=`pkg-config --variable=libdir gnutls`
++imagelibdir=`pkg-config --variable=libdir gnutls`
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+ cups_datadir=@CUPS_DATADIR@
diff --git a/cups.spec b/cups.spec
index ad282ac..ebe8167 100644
--- a/cups.spec
+++ b/cups.spec
@@ -24,6 +24,7 @@ Patch0: cups-svn.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
+Patch4: cups-multilib.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -111,6 +112,7 @@ lpd emulation.
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
+%patch4 -p1 -b .multilib
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -377,6 +379,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon May 22 2006 Tim Waugh <twaugh@redhat.com>
+- Fixed devel package multilib conflict (bug #192664).
+
 * Mon May 22 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.0-7
 - Sync to svn5568.  No longer need rpath patch.
 - Added a 'conflicts:' for kdelibs to prevent bug #192548.