[packages/ghostscript: 1/2] - up to 9.10 - cups package has been removed upstream, obsoleted by cups-filters package

baggins baggins at pld-linux.org
Tue Nov 12 20:37:04 CET 2013


commit 191f0636bebc09eb7ffecf9b7487fa88aea6c587
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Nov 12 20:35:47 2013 +0100

    - up to 9.10
    - cups package has been removed upstream, obsoleted by cups-filters package

 ghostscript-cups-filters.patch          | 17 -----------
 ghostscript-cups-sh.patch               | 12 --------
 ghostscript-gdevcups-debug-uninit.patch | 11 --------
 ghostscript-missquotes.patch            |  4 +--
 ghostscript-setuid.patch                |  4 +--
 ghostscript-zlib.patch                  |  4 +--
 ghostscript.spec                        | 50 ++++-----------------------------
 7 files changed, 11 insertions(+), 91 deletions(-)
---
diff --git a/ghostscript.spec b/ghostscript.spec
index 63ddf61..82a1fed 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -17,19 +17,18 @@ 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:	9.06
-Release:	3
+Version:	9.10
+Release:	1
 License:	GPL v3+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/ghostscript/%{name}-%{version}.tar.bz2
-# Source0-md5:	46f9ebe40dc52755287b30704270db11
+# Source0-md5:	7179bb1ed4f6f453147e6f7e1f210ce8
 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
 
 Patch3:		%{name}-svga-shared.patch
-Patch5:		%{name}-cups-sh.patch
 Patch6:		%{name}-gdevcd8-fixes.patch
 Patch7:		%{name}-fPIC.patch
 Patch8:		%{name}-zlib.patch
@@ -37,16 +36,13 @@ Patch8:		%{name}-zlib.patch
 # fedora
 Patch20:	%{name}-scripts.patch
 Patch21:	%{name}-runlibfileifexists.patch
-Patch26:	%{name}-cups-filters.patch
 Patch27:	%{name}-Fontmap.local.patch
 Patch28:	%{name}-iccprofiles-initdir.patch
-Patch29:	%{name}-gdevcups-debug-uninit.patch
 
 URL:		http://www.ghostscript.com/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.6
 %{?with_cairo:BuildRequires:	cairo-devel >= 1.2.0}
-BuildRequires:	cups-devel
 BuildRequires:	dbus-devel
 BuildRequires:	docbook-style-dsssl
 BuildRequires:	fontconfig-devel
@@ -113,18 +109,6 @@ GhostScript, PostScript ve PDF uyumlu dosyaları, X penceresinde
 gösterebilir ve birçok yazıcının (renkli yazıcılar dahil) basabileceği
 biçime getirebilir.
 
-%package cups
-Summary:	Ghostscript CUPS files
-Summary(pl.UTF-8):	Pliki Ghostscripta dla CUPS-a
-Group:		Applications/Graphics
-Requires:	%{name} = %{version}-%{release}
-
-%description cups
-This package contains CUPS files provided by ghostscript.
-
-%description cups -l pl.UTF-8
-Ten pakiet zawiera pliki dla CUPS-a dostarczane przez ghostscript.
-
 %package gtk
 Summary:	Ghostscript with GTK+ console
 Summary(pl.UTF-8):	Ghostscript z konsolą GTK+
@@ -211,9 +195,10 @@ Statyczna wersja biblioteki IJS.
 %patch0 -p1
 %patch1 -p1
 
+%if %{with svga}
 %patch3 -p1
+%endif
 
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -221,10 +206,8 @@ Statyczna wersja biblioteki IJS.
 %patch20 -p1
 %patch21 -p1
 
-%patch26 -p1
 %patch27 -p1
 %patch28 -p1
-%patch29 -p1
 
 %build
 %if %{with system_jbig2dec}
@@ -234,17 +217,9 @@ Statyczna wersja biblioteki IJS.
 %{__rm} -r libpng zlib
 # jpeg is built with different configuration (D_MAX_BLOCKS_IN_MCU=64)
 # openjpeg is post-1.4 or modified
-# jasper is modified (and not used if openjpeg is not explicitly disabled)
 # lcms is modified, but lcms2 is used by default
 %{__rm} -r lcms
 %{?with_system_lcms2:%{__rm} -r lcms2}
-cd jasper
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd ..
 %{__aclocal}
 %{__autoconf}
 %configure \
@@ -255,7 +230,6 @@ cd ..
 	--with-drivers=ALL%{?with_svga:,svga} \
 	--with-fontpath="%{_datadir}/fonts:%{_datadir}/fonts/Type1" \
 	--with-ijs \
-	--with-install-cups \
 	--with-jbig2dec \
 	--with-pdftoraster \
 	--with-system-libtiff \
@@ -313,8 +287,6 @@ bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 #mv -f $RPM_BUILD_ROOT%{_bindir}/{gsc,gs}
 ln -sf gs $RPM_BUILD_ROOT%{_bindir}/gsc
 ln -sf gs $RPM_BUILD_ROOT%{_bindir}/ghostscript
-ln -s gstoraster $RPM_BUILD_ROOT%{_ulibdir}/cups/filter/pdftoraster
-ln -s gstoraster $RPM_BUILD_ROOT%{_ulibdir}/cups/filter/pstoraster
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -341,7 +313,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ijs_server_example
 %attr(755,root,root) %{_bindir}/pdf2dsc
 %attr(755,root,root) %{_bindir}/pdf2ps
-%attr(755,root,root) %{_bindir}/pdfopt
 %attr(755,root,root) %{_bindir}/pf2afm
 %attr(755,root,root) %{_bindir}/pfbtopfa
 %attr(755,root,root) %{_bindir}/printafm
@@ -386,7 +357,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gsnd.1*
 %{_mandir}/man1/pdf2dsc.1*
 %{_mandir}/man1/pdf2ps.1*
-%{_mandir}/man1/pdfopt.1*
 %{_mandir}/man1/pf2afm.1*
 %{_mandir}/man1/pfbtopfa.1*
 %{_mandir}/man1/printafm.1*
@@ -405,16 +375,6 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_mandir}/fr/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 
-%files cups
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_ulibdir}/cups/filter/gstopxl
-%attr(755,root,root) %{_ulibdir}/cups/filter/gstoraster
-%attr(755,root,root) %{_ulibdir}/cups/filter/pdftoraster
-%attr(755,root,root) %{_ulibdir}/cups/filter/pstoraster
-%{_datadir}/cups/model/pxlcolor.ppd
-%{_datadir}/cups/model/pxlmono.ppd
-%{_datadir}/cups/mime/gstoraster.convs
-
 %if %{with gtk}
 %files gtk
 %defattr(644,root,root,755)
diff --git a/ghostscript-cups-filters.patch b/ghostscript-cups-filters.patch
deleted file mode 100644
index fbcd3e8..0000000
--- a/ghostscript-cups-filters.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up ghostscript-9.02/cups/cups.mak.cups-filters ghostscript-9.02/cups/cups.mak
---- ghostscript-9.02/cups/cups.mak.cups-filters	2011-02-28 22:31:28.000000000 +0000
-+++ ghostscript-9.02/cups/cups.mak	2011-04-04 12:39:23.691844891 +0100
-@@ -56,10 +56,8 @@
- 	    $(INSTALL_PROGRAM) $(GSTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter; \
- 	fi
- 	$(INSTALL_PROGRAM) cups/gstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter
--	-mkdir -p $(DESTDIR)$(CUPSSERVERROOT)
--	if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
--	    $(INSTALL_DATA) cups/gstoraster.convs $(DESTDIR)$(CUPSSERVERROOT); \
--	fi
-+	-mkdir -p $(DESTDIR)$(CUPSDATA)/mime
-+	$(INSTALL_DATA) cups/gstoraster.convs $(DESTDIR)$(CUPSDATA)/mime
- 	-mkdir -p $(DESTDIR)$(CUPSDATA)/model
- 	$(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model
- 	$(INSTALL_DATA) cups/pxlmono.ppd $(DESTDIR)$(CUPSDATA)/model
-
diff --git a/ghostscript-cups-sh.patch b/ghostscript-cups-sh.patch
deleted file mode 100644
index 3d84415..0000000
--- a/ghostscript-cups-sh.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ghostscript-9.02/base/configure.ac~	2011-06-11 11:51:32.885645350 +0200
-+++ ghostscript-9.02/base/configure.ac	2011-06-11 11:52:19.970579073 +0200
-@@ -909,7 +909,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-gdevcups-debug-uninit.patch b/ghostscript-gdevcups-debug-uninit.patch
deleted file mode 100644
index 321f8fa..0000000
--- a/ghostscript-gdevcups-debug-uninit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up ghostscript-9.02/cups/gdevcups.c.gdevcups-debug-uninit ghostscript-9.02/cups/gdevcups.c
---- ghostscript-9.02/cups/gdevcups.c.gdevcups-debug-uninit	2011-03-07 15:40:13.000000000 +0000
-+++ ghostscript-9.02/cups/gdevcups.c	2011-04-04 12:40:48.995443449 +0100
-@@ -815,6 +815,7 @@ cups_get_matrix(gx_device *pdev,	/* I - 
-   dprintf4("DEBUG2: PageSize = [ %d %d ], HWResolution = [ %d %d ]\n",
- 	   cups->header.PageSize[0], cups->header.PageSize[1],
- 	   cups->header.HWResolution[0], cups->header.HWResolution[1]);
-+  if (size_set)
-     dprintf4("DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
- 	     pdev->HWMargins[0], pdev->HWMargins[1], pdev->HWMargins[2],
- 	     pdev->HWMargins[3]);
diff --git a/ghostscript-missquotes.patch b/ghostscript-missquotes.patch
index 3bf6d69..6ce2bc8 100644
--- a/ghostscript-missquotes.patch
+++ b/ghostscript-missquotes.patch
@@ -56,8 +56,8 @@ diff -urN espgs-7.07.1rc2.org/lib/pfbtopfa espgs-7.07.1rc2/lib/pfbtopfa
  then
      outfile=`basename "$1" \.pfb`.pfa
 
---- ghostscript/base/configure.ac~	2007-08-06 21:11:16.000000000 +0200
-+++ ghostscript/base/configure.ac	2007-08-06 21:15:25.337043110 +0200
+--- ghostscript/configure.ac~	2007-08-06 21:11:16.000000000 +0200
++++ ghostscript/configure.ac	2007-08-06 21:15:25.337043110 +0200
 @@ -1390,9 +1390,9 @@
  
  while test -n "$drivers"; do
diff --git a/ghostscript-setuid.patch b/ghostscript-setuid.patch
index 1371fd1..bca1571 100644
--- a/ghostscript-setuid.patch
+++ b/ghostscript-setuid.patch
@@ -40,8 +40,8 @@
  
      gs_get_real_stdio(stdfiles);
      arg_init(&args, (const char **)argv, argc,
---- gs/base/gdevl256.c.orig	Mon Jan 11 07:38:07 1999
-+++ gs/base/gdevl256.c	Thu Mar 30 23:03:57 2000
+--- gs/devices/gdevl256.c.orig	Mon Jan 11 07:38:07 1999
++++ gs/devices/gdevl256.c	Thu Mar 30 23:03:57 2000
 @@ -38,6 +38,17 @@
  #include <vga.h>
  #include <vgagl.h>
diff --git a/ghostscript-zlib.patch b/ghostscript-zlib.patch
index d7092c5..7ecb3c2 100644
--- a/ghostscript-zlib.patch
+++ b/ghostscript-zlib.patch
@@ -1,5 +1,5 @@
---- ghostscript-9.02/base/configure.ac~	2011-07-12 22:52:14.000000000 +0200
-+++ ghostscript-9.02/base/configure.ac	2011-07-12 23:01:05.464937334 +0200
+--- 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.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ghostscript.git/commitdiff/7d3293cc1644934e5371370197edc4739f08e152



More information about the pld-cvs-commit mailing list