- rel 4; fix romfs linking with zlib

Changed files:
    ghostscript-git.patch -> 1.2
    ghostscript-zlib.patch -> 1.1
    ghostscript.spec -> 1.208

diff --git a/ghostscript-git.patch b/ghostscript-git.patch
index 72512d5140384a6b40db3134178d089f1b0193d3..bfc9ca17f37c6fd5dfdee2a4f33443fc439e3692 100644 (file)
--- a/ghostscript-git.patch
+++ b/ghostscript-git.patch
@@ -54,3 +54,40 @@ index a420a84..f3c656a 100644
                  return index+1;
          }
      }
+commit 6f6e28de040e17580fa2a92ce65368cd13ca9964
+Author: Chris Liddell <chris.liddell@artifex.com>
+Date:   Tue Feb 22 16:10:08 2011 +0000
+
+    Tweak to allow compressed romfs to be built when we're configured
+    to use the system's zlib rather than our own.
+    
+    As a side effect of this, freetype is now configured to use the
+    same zlib instance as Ghostscript (instead of freetype's own
+    subset of zlib sources).
+    
+    Bug 691986
+    
+    No cluster differences expected.
+    
+    git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@12184 a1074d23-0009-0410-80fe-cf8c14f379e6
+
+diff --git a/gs/base/lib.mak b/gs/base/lib.mak
+index d97c3d4..44275b4 100644
+--- a/gs/base/lib.mak
++++ b/gs/base/lib.mak
+@@ -2823,10 +2823,14 @@
+ 
+ # Define the ZLIB modules needed by mnkromfs here to factor it out of top makefiles
+ # Also put the .h dependencies here for the same reason
+-MKROMFS_ZLIB_OBJS=$(GLOBJ)compress.$(OBJ) $(GLOBJ)deflate.$(OBJ) \
++MKROMFS_ZLIB_OBJ_1=
++
++MKROMFS_ZLIB_OBJS_0=$(GLOBJ)compress.$(OBJ) $(GLOBJ)deflate.$(OBJ) \
+       $(GLOBJ)zutil.$(OBJ) $(GLOBJ)adler32.$(OBJ) $(GLOBJ)crc32.$(OBJ) \
+       $(GLOBJ)trees.$(OBJ)
+ 
++MKROMFS_ZLIB_OBJS=$(MKROMFS_ZLIB_OBJS_$(SHARE_ZLIB))
++
+ MKROMFS_COMMON_DEPS=$(stdpre_h) $(stdint__h) $(gsiorom_h) $(arch_h)\
+       $(gsmemret_h) $(gsmalloc_h) $(gsstype_h) $(gp_h) $(time__h)
+ 

diff --git a/ghostscript-zlib.patch b/ghostscript-zlib.patch
new file mode 100644 (file)
index 0000000..7ecb3c2
--- /dev/null
+++ b/ghostscript-zlib.patch
@@ -0,0 +1,11 @@
+--- ghostscript-9.02/configure.ac~     2011-07-12 22:52:14.000000000 +0200
++++ ghostscript-9.02/configure.ac      2011-07-12 23:01:05.464937334 +0200
+@@ -594,6 +594,8 @@
+   local directory named 'zlib'. See http://www.gzip.org/zlib/
+   for more information.
+   ])
++else
++  LIBS="$LIBS -lz"
+ fi
+ 
+ dnl if GS is to use the system zlib, freetype

diff --git a/ghostscript.spec b/ghostscript.spec
index 2e83b152fab3e168d060349f783fab6428180286..40cb853c85ac88bc98c75fe1ad155ae133c93a0c 100644 (file)
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -17,7 +17,7 @@ Summary(pl.UTF-8):    Bezpłatny interpreter i renderer PostScriptu i PDF
 Summary(tr.UTF-8):     PostScript & PDF yorumlayıcı ve gösterici
 Name:          ghostscript
 Version:       9.02
-Release:       3
+Release:       4
 License:       GPL v3+
 Group:         Applications/Graphics
 Source0:       http://downloads.sourceforge.net/ghostscript/%{name}-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Patch5:               %{name}-cups-sh.patch
 Patch6:                %{name}-gdevcd8-fixes.patch
 Patch7:                %{name}-fPIC.patch
 Patch8:                %{name}-git.patch
+Patch9:                %{name}-zlib.patch
 URL:           http://www.ghostscript.com/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.6
@@ -189,6 +190,7 @@ Statyczna wersja biblioteki IJS.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
+%patch9 -p1
 
 %build
 %if %{with system_jbig2dec}