diff --git a/.gitignore b/.gitignore index 25ef1e2..a66f87b 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ /cups-filters-1.13.2.tar.xz /cups-filters-1.13.3.tar.xz /cups-filters-1.13.4.tar.xz +/cups-filters-1.13.5.tar.xz diff --git a/cups-filters-apremotequeueid.patch b/cups-filters-apremotequeueid.patch deleted file mode 100644 index 62deee5..0000000 --- a/cups-filters-apremotequeueid.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up cups-filters-1.13.4/utils/cups-browsed.c.apremotequeueid cups-filters-1.13.4/utils/cups-browsed.c ---- cups-filters-1.13.4/utils/cups-browsed.c.apremotequeueid 2017-02-24 12:14:22.099865138 +0100 -+++ cups-filters-1.13.4/utils/cups-browsed.c 2017-02-24 12:18:44.039943820 +0100 -@@ -1,4 +1,4 @@ --/*** -+ /*** - This file is part of cups-filters. - - This file is free software; you can redistribute it and/or modify it -@@ -3491,7 +3491,8 @@ gboolean handle_cups_queues(gpointer unu - cups_job_t *jobs; - ipp_t *request; - time_t current_time = time(NULL); -- int i, new_cupsfilter_line_inserted, cont_line_read, want_raw; -+ int i, new_cupsfilter_line_inserted, ap_remote_queue_id_line_inserted, -+ cont_line_read, want_raw; - char *disabled_str, *ptr, *prefix; - const char *loadedppd = NULL; - int pass_through_ppd; -@@ -3813,6 +3814,7 @@ gboolean handle_cups_queues(gpointer unu - " and inhibiting client-side filtering of the job" : ""), - buf); - new_cupsfilter_line_inserted = 0; -+ ap_remote_queue_id_line_inserted = 0; - cont_line_read = 0; - while (cupsFileGets(in, line, sizeof(line))) { - if (pass_through_ppd == 1 && -@@ -3896,6 +3898,14 @@ gboolean handle_cups_queues(gpointer unu - cupsFilePrintf(out, "%s\n", line); - } else if (cont_line_read == 0 || strncmp(line, "*End", 4)) { - cont_line_read = 0; -+ /* Write an "APRemoteQueueID" line to make this queue marked -+ as remote printer by CUPS */ -+ if (strncmp(line, "*%", 2) && -+ strncmp(line, "*PPD-Adobe:", 11) && -+ ap_remote_queue_id_line_inserted == 0) { -+ ap_remote_queue_id_line_inserted = 1; -+ cupsFilePrintf(out, "*APRemoteQueueID: \"\"\n"); -+ } - /* Simply write out the line as we read it */ - cupsFilePrintf(out, "%s\n", line); - } diff --git a/cups-filters.spec b/cups-filters.spec index 600af4a..0e3f014 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -3,8 +3,8 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters -Version: 1.13.4 -Release: 2%{?dist} +Version: 1.13.5 +Release: 1%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -20,8 +20,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 -Patch01: cups-filters-apremotequeueid.patch - Requires: cups-filters-libs%{?_isa} = %{version}-%{release} # Obsolete cups-php (bug #971741) @@ -73,7 +71,7 @@ Requires: poppler-utils Requires: liberation-mono-fonts # pstopdf -Requires: bc grep sed +Requires: bc grep sed which # cups-browsed Requires(post): systemd @@ -116,7 +114,6 @@ This is the development package for OpenPrinting CUPS filters and backends. %prep %setup -q -%patch01 -p1 -b .apremotequeueid %build # work-around Rpath @@ -155,12 +152,6 @@ install -p -m 644 utils/cups-browsed.service %{buildroot}%{_unitdir} # create it temporarily as a relative symlink ln -sf %{_cups_serverbin}/filter/foomatic-rip %{buildroot}%{_bindir}/foomatic-rip -# imagetobrf is going to be mapped as /usr/lib/cups/filter/imagetoubrl -ln -sf imagetobrf %{buildroot}%{_cups_serverbin}/filter/imagetoubrl - -# textbrftoindex3 is going to be mapped as /usr/lib/cups/filter/textbrftoindexv4 -ln -sf textbrftoindexv3 %{buildroot}%{_cups_serverbin}/filter/textbrftoindexv4 - # Don't ship urftopdf for now (bug #1002947). rm -f %{buildroot}%{_cups_serverbin}/filter/urftopdf sed -i '/urftopdf/d' %{buildroot}%{_datadir}/cups/mime/cupsfilters.convs @@ -239,7 +230,7 @@ fi %{_datadir}/cups/ppdc/imagemagick.defs %{_datadir}/cups/ppdc/index.defs %{_datadir}/cups/ppdc/liblouis.defs -%{_datadir}/cups/ppdc/liblouis1.defs +%{_datadir}/cups/ppdc/liblouis1.defs.gen.in %{_datadir}/cups/ppdc/liblouis2.defs %{_datadir}/cups/ppdc/liblouis3.defs %{_datadir}/cups/ppdc/liblouis4.defs @@ -280,6 +271,9 @@ fi %{_libdir}/libfontembed.so %changelog +* Fri Apr 28 2017 Zdenek Dohnal - 1.13.5-1 +- rebase to 1.13.5 + * Tue Mar 28 2017 David Tardon - 1.13.4-2 - rebuild for poppler 0.53.0 diff --git a/sources b/sources index 328443d..5b33ade 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cups-filters-1.13.4.tar.xz) = 848451193c9f0b0f397bc2c8efafab20112525eb2357892b5c46a4900d3d7e4ef52e537353c04779de2d17c8918cb1fe653e3c8db81f6ef246deca7e4241ce3b +SHA512 (cups-filters-1.13.5.tar.xz) = 1870b16ad64bc46068c8a74be7a112790a6ffc0be0e14cd858d83013b12e1c51efd905fbc4e189a42558814694348a9ef533b6fe504ef7bce3b4da149e0b3ea6