diff --git a/.gitignore b/.gitignore index ce0ac6c..2184e66 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /cups-filters-1.0.69.tar.xz /cups-filters-1.0.70.tar.xz /cups-filters-1.0.71.tar.xz +/cups-filters-1.0.73.tar.xz diff --git a/cups-filters-poppler34.patch b/cups-filters-poppler34.patch deleted file mode 100644 index f50a304..0000000 --- a/cups-filters-poppler34.patch +++ /dev/null @@ -1,36 +0,0 @@ -=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' ---- filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-18 03:17:28 +0000 -+++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:22:49 +0000 -@@ -1811,10 +1811,14 @@ - #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) - maskSplash->drawImage(&imageSrc, &imgMaskData, - splashModeMono8, gFalse, maskWidth, maskHeight, mat); --#else -+#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 - maskSplash->drawImage(&imageSrc, &imgMaskData, - splashModeMono8, gFalse, maskWidth, maskHeight, - mat,gFalse); -+#else -+ maskSplash->drawImage(&imageSrc, 0, &imgMaskData, -+ splashModeMono8, gFalse, maskWidth, maskHeight, -+ mat,gFalse); - #endif - delete imgMaskData.imgStr; - maskStr->close(); - -=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx' ---- filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000 -+++ filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:22:49 +0000 -@@ -240,8 +240,10 @@ - if (rasterMode) { - #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) - return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); --#else -+#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 - return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); -+#else -+ return splash->drawImage(src,0,srcData,srcMode,srcAlpha,w,h,mat,gFalse); - #endif - } else { - return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); - diff --git a/cups-filters.spec b/cups-filters.spec index 421736c..19789d2 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -3,8 +3,8 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters -Version: 1.0.71 -Release: 3%{?dist} +Version: 1.0.73 +Release: 1%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -19,9 +19,6 @@ 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 -# Upstream patch for poppler 0.34 support -# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7371 -Patch0: cups-filters-poppler34.patch Requires: cups-filters-libs%{?_isa} = %{version}-%{release} @@ -116,7 +113,6 @@ This is the development package for OpenPrinting CUPS filters and backends. %prep %setup -q -%patch0 -p0 -b .poppler34 %build # work-around Rpath @@ -216,6 +212,7 @@ fi %attr(0755,root,root) %{_cups_serverbin}/backend/parallel # Serial backend needs to run as root (bug #212577#c4). %attr(0700,root,root) %{_cups_serverbin}/backend/serial +%attr(0755,root,root) %{_cups_serverbin}/backend/implicitclass %{_datadir}/cups/banners %{_datadir}/cups/charsets %{_datadir}/cups/data/* @@ -249,6 +246,9 @@ fi %{_libdir}/libfontembed.so %changelog +* Wed Aug 19 2015 Jiri Popelka - 1.0.73-1 +- 1.0.73 - new implicitclass backend + * Fri Jul 24 2015 David Tardon - 1.0.71-3 - rebuild for Boost 1.58 to fix deps diff --git a/sources b/sources index 890caab..47afeb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1e11dfe5fa52eb65aa0bdd3a7ee0117 cups-filters-1.0.71.tar.xz +7c8d792eb872be5a5b596409e5f05f40 cups-filters-1.0.73.tar.xz