- up to 9.02 (drop obsolete patches)

Changed files:
    ghostscript-binlink.patch -> 1.2
    ghostscript-cups-sh.patch -> 1.2
    ghostscript-fPIC.patch -> 1.2
    ghostscript-libpng14.patch -> 1.2
    ghostscript-system-zlib.patch -> 1.2
    ghostscript.spec -> 1.201

diff --git a/ghostscript-binlink.patch b/ghostscript-binlink.patch
deleted file mode 100644 (file)
index 51e00ad..0000000
--- a/ghostscript-binlink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ghostscript-8.71/base/unix-dll.mak.orig    2009-10-19 22:24:53.000000000 +0200
-+++ ghostscript-8.71/base/unix-dll.mak 2010-09-17 20:35:47.367647439 +0200
-@@ -80,15 +80,16 @@
- 
- $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
-       $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
--      $(LDFLAGS) -L$(BINDIR) -l$(GS)
-+      $(LDFLAGS_BIN) -L$(BINDIR) -l$(GS)
- 
- $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
-       $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
--      $(LDFLAGS) -L$(BINDIR) -l$(GS) $(SOC_LIBS)
-+      $(LDFLAGS_BIN) -L$(BINDIR) -l$(GS) $(SOC_LIBS)
- 
- # ------------------------- Recursive make targets ------------------------- #
- 
- SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\
-+ LDFLAGS_BIN='$(LDFLAGS)'\
-  GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
-  STDIO_IMPLEMENTATION=c\
-  DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\

diff --git a/ghostscript-cups-sh.patch b/ghostscript-cups-sh.patch
index 8a91097d43ca5f9c82c3e6f3bd249e23147e3657..5ee3b7f519b3b35dc99f1a85fa9457172c8be3d5 100644 (file)
--- a/ghostscript-cups-sh.patch
+++ b/ghostscript-cups-sh.patch
@@ -1,11 +1,11 @@
---- ghostscript-8.71/configure.ac.orig 2010-09-12 20:06:48.571133459 +0200
-+++ ghostscript-8.71/configure.ac      2010-09-12 21:41:49.847134297 +0200
-@@ -531,7 +531,7 @@
-           CUPSDEV="\$(DD)cups.dev"
-           CUPSVERSION="`$CUPSCONFIG --version`"
-           if ( test x$with_pdftoraster != xno ); then
--              if test "$CUPSVERSION" ">" "1.2"; then
-+              if echo "$CUPSVERSION" | grep -q '^1\.[[2-9]]'; then
-                   CUPSPDFTORASTER="1"
-               fi
-           fi
+--- ghostscript-9.02/configure.ac~     2011-06-11 11:51:32.885645350 +0200
++++ ghostscript-9.02/configure.ac      2011-06-11 11:52:19.970579073 +0200
+@@ -769,7 +769,7 @@
+               LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
+               LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
+               if ( test x$with_pdftoraster != xno ); then
+-                  if test "$CUPSVERSION" ">" "1.2"; then
++                  if echo "$CUPSVERSION" | grep -q '^1\.[[2-9]]'; then
+                       CUPSPDFTORASTER="1"
+                   fi
+               fi

diff --git a/ghostscript-fPIC.patch b/ghostscript-fPIC.patch
index 3d64259a075c1d67645345e69496ac643765f9eb..026b4efba8b4a9e67c2e2487c01d1036aca27538 100644 (file)
--- a/ghostscript-fPIC.patch
+++ b/ghostscript-fPIC.patch
@@ -1,15 +1,3 @@
-diff -up ghostscript-8.64/base/devs.mak.fPIC ghostscript-8.64/base/devs.mak
---- ghostscript-8.64/base/devs.mak.fPIC        2008-11-07 18:49:34.000000000 +0000
-+++ ghostscript-8.64/base/devs.mak     2009-02-04 11:34:21.000000000 +0000
-@@ -456,7 +456,7 @@ $(GLOBJ)gdevx.$(OBJ) : $(GLSRC)gdevx.c $
-       $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c
- 
- $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h)
--      $(GLCC) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
-+      $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
- 
- $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\
-  $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h)
 diff -up ghostscript-8.64/base/lib.mak.fPIC ghostscript-8.64/base/lib.mak
 --- ghostscript-8.64/base/lib.mak.fPIC 2009-01-08 09:17:18.000000000 +0000
 +++ ghostscript-8.64/base/lib.mak      2009-02-04 11:34:21.000000000 +0000

diff --git a/ghostscript-libpng14.patch b/ghostscript-libpng14.patch
deleted file mode 100644 (file)
index b2f3e2d..0000000
--- a/ghostscript-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ghostscript-8.71/configure.ac.orig 2010-09-12 10:34:12.879128431 +0200
-+++ ghostscript-8.71/configure.ac      2010-09-12 19:34:10.199128431 +0200
-@@ -402,7 +402,7 @@
-       PNGDEVS="$PNGDEVS_ALL"
- else
-       AC_MSG_RESULT([no])
--      AC_CHECK_LIB(png, png_check_sig, [
-+      AC_CHECK_LIB(png, png_sig_cmp, [
-         AC_CHECK_HEADERS(png.h, [
-               SHARE_LIBPNG=1
-               PNGDEVS="$PNGDEVS_ALL"

diff --git a/ghostscript-system-zlib.patch b/ghostscript-system-zlib.patch
deleted file mode 100644 (file)
index a57a775..0000000
--- a/ghostscript-system-zlib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ghostscript-8.71/base/unix-aux.mak.orig    2009-01-08 10:17:18.000000000 +0100
-+++ ghostscript-8.71/base/unix-aux.mak 2010-09-12 20:04:42.987128431 +0200
-@@ -77,13 +77,24 @@
- $(GENINIT_XE): $(GLSRC)geninit.c $(AK) $(GENINIT_DEPS)
-       $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENINIT_XE) $(GLSRC)geninit.c
- 
-+ifeq ($(SHARE_ZLIB),1)
-+MKROMFS_OBJS= $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
-+ $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
-+ $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
-+ $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
-+else
- MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
-  $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
-  $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
-  $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
-+endif
- 
- $(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS)
-+ifeq ($(SHARE_ZLIB),1)
-+      $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE) $(MKROMFS_OBJS) -lm -lz $(EXTRALIBS)
-+else
-       $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE) $(MKROMFS_OBJS) -lm $(EXTRALIBS)
-+endif
- 
- # Query the environment to construct gconfig_.h.
- # The "else true;" is required because Ultrix's implementation of sh -e

diff --git a/ghostscript.spec b/ghostscript.spec
index e921a2ebb66e0e017f96ce2b5d1476eaf1a94d2d..0c3f270d3eba4900bf5282bb705fe1d995770612 100644 (file)
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -16,23 +16,20 @@ Summary(ja.UTF-8):  PostScript インタープリタ・レンダラー
 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:       8.71
-Release:       3
+Version:       9.02
+Release:       1
 License:       GPL v3+
 Group:         Applications/Graphics
-Source0:       http://ghostscript.com/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 5005d68f7395c2bfc4b05c1a60d9b6ba
+Source0:       http://downloads.ghostscript.com/public/%{name}-%{version}.tar.bz2
+# Source0-md5: f67151444bd56a7904579fc75a083dd6
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 9b5953aa0cc155f4364f20036b848585
 Patch0:                %{name}-missquotes.patch
 Patch1:                %{name}-setuid.patch
 Patch2:                %{name}-time_h.patch
-Patch3:                %{name}-libpng14.patch
-Patch4:                %{name}-system-zlib.patch
 Patch5:                %{name}-cups-sh.patch
 Patch6:                %{name}-gdevcd8-fixes.patch
 Patch7:                %{name}-fPIC.patch
-Patch8:                %{name}-binlink.patch
 URL:           http://www.ghostscript.com/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.6
@@ -184,12 +181,10 @@ Statyczna wersja biblioteki IJS.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 %if %{with system_jbig2dec}
@@ -314,16 +309,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ps2pdfwr
 %attr(755,root,root) %{_bindir}/ps2ps
 %attr(755,root,root) %{_bindir}/ps2ps2
+%attr(755,root,root) %{_bindir}/pphs
 %attr(755,root,root) %{_bindir}/wftopfa
 %attr(755,root,root) %{_libdir}/libgs.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgs.so.8
+%attr(755,root,root) %ghost %{_libdir}/libgs.so.9
 %attr(755,root,root) %{_libdir}/libijs-*.so
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{version}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/%{version}
 %dir %{_datadir}/%{name}/%{version}/lib
-%{_datadir}/%{name}/%{version}/Resource
 %{_datadir}/%{name}/%{version}/examples
 %{_datadir}/%{name}/%{version}/lib/*.ppd
 %{_datadir}/%{name}/%{version}/lib/*.ps
@@ -331,7 +326,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/%{version}/lib/*.src
 %{_datadir}/%{name}/%{version}/lib/*.upp
 %{_datadir}/%{name}/%{version}/lib/*.x[bp]m
-%{_datadir}/%{name}/%{version}/lib/pphs
 %{_mandir}/man1/dvipdf.1*
 %{_mandir}/man1/eps2eps.1*
 %{_mandir}/man1/font2c.1*
@@ -365,11 +359,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files cups
 %defattr(644,root,root,755)
-/etc/cups/pdftoraster.convs
-/etc/cups/pstoraster.convs
-%attr(755,root,root) %{_ulibdir}/cups/filter/pdftoraster
+/etc/cups/gstoraster.convs
+%attr(755,root,root) %{_ulibdir}/cups/filter/gstoraster
 %attr(755,root,root) %{_ulibdir}/cups/filter/pstopxl
-%attr(755,root,root) %{_ulibdir}/cups/filter/pstoraster
 %{_datadir}/cups/model/pxlcolor.ppd
 %{_datadir}/cups/model/pxlmono.ppd