From 6b99ba079f4d62c3467e2d5b02f633684e60ea73 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Nov 20 2017 18:49:33 +0000 Subject: fixing patch for upstream issue 1413 --- diff --git a/cups-filters-location.patch b/cups-filters-location.patch index d4accb0..57fa021 100644 --- a/cups-filters-location.patch +++ b/cups-filters-location.patch @@ -1,7 +1,28 @@ 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-10-06 13:35:52.733437212 +0200 -+++ cups-filters-1.16.1/utils/cups-browsed.c 2017-10-06 13:38:11.053339580 +0200 -@@ -6360,7 +6360,7 @@ static void +--- 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)://:631/printers/ +@@ -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")) +@@ -6360,7 +6361,7 @@ static void browse_poll_get_printers (browsepoll_t *context, http_t *conn) { static const char * const rattrs[] = { "printer-uri-supported", diff --git a/cups-filters.spec b/cups-filters.spec index 23b0b21..e02cd10 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -4,7 +4,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters Version: 1.16.1 -Release: 2%{?dist} +Release: 3%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -272,6 +272,9 @@ fi %{_libdir}/libfontembed.so %changelog +* Mon Nov 20 2017 Zdenek Dohnal - 1.16.1-3 +- fixing patch for upstream issue 1413 + * Fri Oct 06 2017 Zdenek Dohnal - 1.16.1-2 - upstream 1413 - Propagation of location doesn't work