From ad5aa32f171877ab4acac9f178ac1af56d8003a6 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Wed, 11 Jun 2014 15:51:08 +0200 Subject: [PATCH] Remove (F21) pdf-landscape.patch --- cups-filters-pdf-landscape.patch | 34 -------------------------------- cups-filters.spec | 17 ++++++++-------- 2 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 cups-filters-pdf-landscape.patch diff --git a/cups-filters-pdf-landscape.patch b/cups-filters-pdf-landscape.patch deleted file mode 100644 index 30ffbfc..0000000 --- a/cups-filters-pdf-landscape.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up cups-filters-1.0.53/filter/pdftops.c.pdf-landscape cups-filters-1.0.53/filter/pdftops.c ---- cups-filters-1.0.53/filter/pdftops.c.pdf-landscape 2014-05-09 12:18:35.679501730 +0200 -+++ cups-filters-1.0.53/filter/pdftops.c 2014-05-09 12:19:34.114704598 +0200 -@@ -646,23 +646,23 @@ main(int argc, /* I - Number of comm - 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. - */ - -- pdf_argv[pdf_argc++] = (char *)"-origpagesizes"; -- pdf_argv[pdf_argc++] = (char *)"-nocenter"; -+ //pdf_argv[pdf_argc++] = (char *)"-origpagesizes"; -+ //pdf_argv[pdf_argc++] = (char *)"-nocenter"; - } - else - #endif /* HAVE_POPPLER_PDFTOPS_WITH_ORIGPAGESIZES */ - 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. - */ - -- pdf_argv[pdf_argc++] = (char *)"-choosePaperByPDFPageSize"; -+ //pdf_argv[pdf_argc++] = (char *)"-choosePaperByPDFPageSize"; - } - - /* diff --git a/cups-filters.spec b/cups-filters.spec index 4d9d26e..f1abffa 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -4,7 +4,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters Version: 1.0.54 -Release: 2%{?dist} +Release: 3%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -12,7 +12,7 @@ Release: 2%{?dist} # backends: parallel, serial # GPLv2+: filters: gstopxl, textonly, texttops, imagetops, foomatic-rip # GPLv3: filters: bannertopdf -# GPLv3+: filters: urftopdf +# GPLv3+: filters: urftopdf, rastertopdf # LGPLv2+: utils: cups-browsed # MIT: filters: gstoraster, pdftoijs, pdftoopvp, pdftopdf, pdftoraster License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT @@ -20,8 +20,7 @@ License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz -Patch1: cups-filters-pdf-landscape.patch -Patch2: cups-filters-makefile.patch +Patch1: cups-filters-makefile.patch Requires: cups-filters-libs%{?_isa} = %{version}-%{release} @@ -117,11 +116,8 @@ This is the development package for OpenPrinting CUPS filters and backends. %prep %setup -q -# Fix PDF landscape printing (bug #768811). -%patch1 -p1 -b .pdf-landscape - # Fixed build issue (bug #1106101). -%patch2 -p1 -b .cups-filters +%patch1 -p1 -b .cups-filters %build # work-around Rpath @@ -184,7 +180,7 @@ if [ $1 -eq 1 ] ; then # We can remove this after few releases, it's just for the introduction of cups-browsed. if [ -f "$OUT" ]; then - echo -e "\n# NOTE: This file is not part of CUPS. You need to start & enable cups-browsed service." >> "$OUT" + echo -e "\n# NOTE: This file is not part of CUPS.\n# You need to enable cups-browsed service\n# and allow ipp-client service in firewall." >> "$OUT" fi # move BrowsePoll from cupsd.conf to cups-browsed.conf @@ -251,6 +247,9 @@ fi %{_libdir}/libfontembed.so %changelog +* Wed Jun 11 2014 Jiri Popelka - 1.0.54-3 +- Remove (F21) pdf-landscape.patch + * Wed Jun 11 2014 Tim Waugh - 1.0.54-2 - Fix build issue (bug #1106101). - Don't use grep's -P switch in pstopdf as it needs execmem (bug #1079534).