From f21c6e9eb1c1683abc98d09e761a73127e87b6ec Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 26 May 2006 14:03:07 +0000
Subject: [PATCH] - Fix ijs-config not to have multilib conflicts (bug #192672)

---
 ghostscript-multilib.patch | 23 +++++++++++++++++++++++
 ghostscript.spec           |  7 +++++++
 2 files changed, 30 insertions(+)
 create mode 100644 ghostscript-multilib.patch

diff --git a/ghostscript-multilib.patch b/ghostscript-multilib.patch
new file mode 100644
index 0000000..71edd02
--- /dev/null
+++ b/ghostscript-multilib.patch
@@ -0,0 +1,23 @@
+--- espgs-8.15.2/ijs/ijs-config.in.multilib	2006-05-26 13:58:56.000000000 +0100
++++ espgs-8.15.2/ijs/ijs-config.in	2006-05-26 15:01:00.000000000 +0100
+@@ -1,7 +1,6 @@
+ #!/bin/sh
+ 
+ prefix=@prefix@
+-libdir=@libdir@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ 
+@@ -44,11 +43,7 @@
+       echo $includes
+       ;;
+     --libs)
+-      case "x$libdir" in
+-        x/lib | x/lib64 | x/usr/lib | x/usr/lib64) ;;
+-        *) libdirs="-L$libdir" ;;
+-      esac
+-      echo $libdirs -lijs
++      echo -lijs
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/ghostscript.spec b/ghostscript.spec
index 407716c..ae538dc 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -14,6 +14,7 @@ Source0: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/%{?
 Source1: FAPIcidfmap
 Source4: cidfmap
 
+Patch1: ghostscript-multilib.patch
 Patch2: ghostscript-gtk2.patch
 Patch3: ghostscript-scripts.patch
 Patch4: ghostscript-ps2epsi.patch
@@ -76,6 +77,9 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
 %prep
 %setup -q -n espgs-%{gs_ver}%{?gs_rc:%gs_rc}
 
+# Fix ijs-config not to have multilib conflicts (bug #192672)
+%patch1 -p1 -b .multilib
+
 # Make it build.
 %patch2 -p1 -b .gtk2
 
@@ -256,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libijs.*a
 
 %changelog
+* Fri May 26 2006 Tim Waugh <twaugh@redhat.com>
+- Fix ijs-config not to have multilib conflicts (bug #192672)
+
 * Tue May  2 2006 Tim Waugh <twaugh@redhat.com> 8.15.2-3
 - Remove adobe-cmaps and acro5-cmaps, since latest CMaps are already
   included (bug #190463).