fixing patch for upstream issue 1413

This commit is contained in:
Zdenek Dohnal 2017-11-21 10:11:44 +01:00
commit d5b8735cd1
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff -up cups-filters-1.16.1/utils/cups-browsed.c.location cups-filters-1.16.1/utils/cups-browsed.c
--- cups-filters-1.16.1/utils/cups-browsed.c.location 2017-08-09 20:02:48.000000000 +0200
+++ cups-filters-1.16.1/utils/cups-browsed.c 2017-11-20 19:40:25.943791715 +0100
@@ -4472,6 +4472,9 @@ gboolean update_cups_queues(gpointer unu
IPP_PRINTER_IDLE);
/* ... and accepting jobs */
ippAddBoolean(request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1);
+ /* Location */
+ ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+ "printer-location", NULL, p->location);
num_options = 0;
options = NULL;
/* Device URI: ipp(s)://<remote host>:631/printers/<remote queue>
@@ -4484,9 +4487,7 @@ gboolean update_cups_queues(gpointer unu
/* Description */
num_options = cupsAddOption("printer-info", p->info,
num_options, &options);
- /* Location */
- num_options = cupsAddOption("printer-location", p->location,
- num_options, &options);
+
/* Default option settings from printer entry */
for (i = 0; i < p->num_options; i ++)
if (strcasecmp(p->options[i].name, "printer-is-shared"))

View File

@ -4,7 +4,7 @@
Summary: OpenPrinting CUPS filters and backends
Name: cups-filters
Version: 1.17.9
Release: 2%{?dist}
Release: 3%{?dist}
# For a breakdown of the licensing, see COPYING file
# GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*,
@ -20,6 +20,8 @@ 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-location.patch
Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
BuildRequires: cups-devel
@ -101,6 +103,8 @@ This is the development package for OpenPrinting CUPS filters and backends.
%prep
%setup -q
%patch01 -p1 -b .location
%build
# work-around Rpath
@ -273,6 +277,9 @@ fi
%{_libdir}/libfontembed.so
%changelog
* Mon Nov 20 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1.16.1-3
- fixing patch for upstream issue 1413
* Wed Nov 08 2017 David Tardon <dtardon@redhat.com> - 1.17.9-2
- rebuild for poppler 0.61.0