rpms/cups/devel cups-multilib.patch,NONE,1.1 cups.spec,1.201,1.202

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1275

Modified Files:
	cups.spec 
Added Files:
	cups-multilib.patch 
Log Message:
* Mon May 22 2006 Tim Waugh <twaugh at redhat.com>
- Fixed devel package multilib conflict (bug #192664).


cups-multilib.patch:
 cups-config.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE cups-multilib.patch ---
--- 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@


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- cups.spec	22 May 2006 17:17:00 -0000	1.201
+++ cups.spec	22 May 2006 18:13:40 -0000	1.202
@@ -24,6 +24,7 @@
 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 @@
 %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 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon May 22 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed devel package multilib conflict (bug #192664).
+
 * Mon May 22 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-7
 - Sync to svn5568.  No longer need rpath patch.
 - Added a 'conflicts:' for kdelibs to prevent bug #192548.