From: Jan Rękorajski Date: Sun, 29 Dec 2013 21:27:02 +0000 (+0100) Subject: - up to 1.0.43 X-Git-Tag: auto/th/cups-filters-1.0.43-1 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=2f02cc8cafb6649071b40eaf6d8661b8fbccc88c;p=packages%2Fcups-filters.git - up to 1.0.43 - removed obsoleted patches - package and obsolete foomatic filter (there won't be a new foomatic-filters, all that was there is here) --- diff --git a/cups-filters-cups15.patch b/cups-filters-cups15.patch deleted file mode 100644 index f1899f1..0000000 --- a/cups-filters-cups15.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- cups-filters-1.0.41/utils/cups-browsed.c.orig 2013-10-29 10:53:53.000000000 +0100 -+++ cups-filters-1.0.41/utils/cups-browsed.c 2013-12-01 08:39:32.055087675 +0100 -@@ -227,16 +227,6 @@ - } - - int --ippSetVersion(ipp_t *ipp, int major, int minor) --{ -- if (!ipp || major < 0 || minor < 0) -- return (0); -- ipp->request.any.version[0] = major; -- ipp->request.any.version[1] = minor; -- return (1); --} -- --int - ippSetVersion(ipp_t *ipp, - int major, - int minor) diff --git a/cups-filters-pdf-landscape.patch b/cups-filters-pdf-landscape.patch deleted file mode 100644 index 5c9a776..0000000 --- a/cups-filters-pdf-landscape.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up cups-filters-1.0.40/filter/pdftops.c.pdf-landscape cups-filters-1.0.40/filter/pdftops.c ---- cups-filters-1.0.40/filter/pdftops.c.pdf-landscape 2013-10-11 17:15:45.639623613 +0100 -+++ cups-filters-1.0.40/filter/pdftops.c 2013-10-11 17:22:41.517421905 +0100 -@@ -273,7 +273,6 @@ main(int argc, /* I - Number of comm - *pstops_options, /* Options for pstops filter */ - *pstops_end; /* End of pstops filter option */ - const char *cups_serverbin; /* CUPS_SERVERBIN environment variable */ -- const char *content_type; /* CONTENT_TYPE environment variable */ - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -457,7 +456,6 @@ main(int argc, /* I - Number of comm - * Build the command-line for the pdftops or gs filter... - */ - -- content_type = getenv("CONTENT_TYPE"); - if (renderer == PDFTOPS) - { - pdf_argv[0] = (char *)"pdftops"; -@@ -646,25 +644,17 @@ main(int argc, /* I - Number of comm - else if ((renderer == PDFTOPS) || (renderer == PDFTOCAIRO)) - { - /* -- * Use the page sizes of the original PDF document, this way documents -- * which contain pages of different sizes can be printed correctly -+ * No options to add. Note: pdftopdf has already rotated pages -+ * for us. - */ -- -- /* Only do this for unprocessed PDF files */ -- if (content_type && !strstr (content_type, "/vnd.cups-")) -- pdf_argv[pdf_argc++] = (char *)"-origpagesizes"; - } - #endif /* HAVE_POPPLER_PDFTOPS_WITH_ORIGPAGESIZES */ - else if (renderer == ACROREAD) - { - /* -- * Use the page sizes of the original PDF document, this way documents -- * which contain pages of different sizes can be printed correctly -+ * No options to add. Note: pdftopdf has already rotated pages -+ * for us. - */ -- -- /* Only do this for unprocessed PDF files */ -- if (content_type && !strstr (content_type, "/vnd.cups-")) -- pdf_argv[pdf_argc++] = (char *)"-choosePaperByPDFPageSize"; - } - - /* diff --git a/cups-filters.spec b/cups-filters.spec index b047272..564369e 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -7,8 +7,8 @@ Summary: OpenPrinting CUPS filters and backends Summary(pl.UTF-8): Filtry i backendy CUPS-a z projektu OpenPrinting Name: cups-filters -Version: 1.0.42 -Release: 2 +Version: 1.0.43 +Release: 1 # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, # imagetopdf, pstopdf, texttopdf @@ -21,11 +21,9 @@ Release: 2 License: GPL v2, GPL v2+, GPL v3, GPL v3+, LGPL v2+, MIT Group: Applications/Printing Source0: http://www.openprinting.org/download/cups-filters/%{name}-%{version}.tar.xz -# Source0-md5: 3047524b51f2ac064663f1997c7d2c81 -Patch0: %{name}-cups15.patch -Patch1: %{name}-pdf-landscape.patch -Patch2: %{name}-dbus.patch -Patch3: %{name}-php.patch +# Source0-md5: 50f760c4cb7be37544c1174a12b1900e +Patch0: %{name}-dbus.patch +Patch1: %{name}-php.patch URL: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters BuildRequires: autoconf >= 2.65 BuildRequires: automake >= 1:1.11 @@ -69,7 +67,10 @@ Requires: qpdf-libs >= 3.0.2 Requires: bc Requires: grep Requires: sed +Provides: cups-filter-foomatic Provides: ghostscript-cups = 9.08 +Obsoletes: cups-filter-foomatic +Obsoletes: foomatic-filters Obsoletes: ghostscript-cups < 9.08 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -226,8 +227,6 @@ Moduł PHP do ogólnego systemu druku dla Uniksa. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %{__aclocal} @@ -291,10 +290,6 @@ install -p utils/cups-browsed.service $RPM_BUILD_ROOT%{systemdunitdir} # Not sure what is this good for. %{__rm} $RPM_BUILD_ROOT%{_bindir}/ttfread -# currently in foomatic-filters; to be packaged here after new stable foomatic-filters release -%{__rm} $RPM_BUILD_ROOT%{_cups_serverbin}/filter/foomatic-rip \ - $RPM_BUILD_ROOT%{_mandir}/man1/foomatic-rip.1 - %clean rm -rf $RPM_BUILD_ROOT @@ -338,6 +333,7 @@ fi %attr(755,root,root) %{_cups_serverbin}/filter/bannertopdf %attr(755,root,root) %{_cups_serverbin}/filter/commandtoescpx %attr(755,root,root) %{_cups_serverbin}/filter/commandtopclx +%attr(755,root,root) %{_cups_serverbin}/filter/foomatic-rip %attr(755,root,root) %{_cups_serverbin}/filter/gstopxl %attr(755,root,root) %{_cups_serverbin}/filter/gstoraster %attr(755,root,root) %{_cups_serverbin}/filter/imagetopdf @@ -368,6 +364,7 @@ fi %{_datadir}/cups/ppdc/escp.h %{_datadir}/cups/ppdc/pcl.h %{_datadir}/ppd/cupsfilters +%{_mandir}/man1/foomatic-rip.1* %files libs %defattr(644,root,root,755)