- Fix ijs-config not to have multilib conflicts (bug #192672)
This commit is contained in:
parent
d2ff86e758
commit
f21c6e9eb1
23
ghostscript-multilib.patch
Normal file
23
ghostscript-multilib.patch
Normal file
@ -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
|
@ -14,6 +14,7 @@ Source0: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/%{?
|
|||||||
Source1: FAPIcidfmap
|
Source1: FAPIcidfmap
|
||||||
Source4: cidfmap
|
Source4: cidfmap
|
||||||
|
|
||||||
|
Patch1: ghostscript-multilib.patch
|
||||||
Patch2: ghostscript-gtk2.patch
|
Patch2: ghostscript-gtk2.patch
|
||||||
Patch3: ghostscript-scripts.patch
|
Patch3: ghostscript-scripts.patch
|
||||||
Patch4: ghostscript-ps2epsi.patch
|
Patch4: ghostscript-ps2epsi.patch
|
||||||
@ -76,6 +77,9 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n espgs-%{gs_ver}%{?gs_rc:%gs_rc}
|
%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.
|
# Make it build.
|
||||||
%patch2 -p1 -b .gtk2
|
%patch2 -p1 -b .gtk2
|
||||||
|
|
||||||
@ -256,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/libijs.*a
|
%{_libdir}/libijs.*a
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue May 2 2006 Tim Waugh <twaugh@redhat.com> 8.15.2-3
|
||||||
- Remove adobe-cmaps and acro5-cmaps, since latest CMaps are already
|
- Remove adobe-cmaps and acro5-cmaps, since latest CMaps are already
|
||||||
included (bug #190463).
|
included (bug #190463).
|
||||||
|
Loading…
Reference in New Issue
Block a user