From 8aa69860deafd2e1d7e5d1350bc3fe67daa5edd6 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 16 Jan 2018 14:56:21 +0100
Subject: [PATCH] Rebase to 1.19.0

---
 .gitignore                  |  1 +
 cups-filters-location.patch | 24 ------------------------
 cups-filters.spec           | 13 +++++++------
 sources                     |  2 +-
 4 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 cups-filters-location.patch

diff --git a/.gitignore b/.gitignore
index 5bee492..660beb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,4 @@
 /cups-filters-1.17.7.tar.xz
 /cups-filters-1.17.8.tar.xz
 /cups-filters-1.17.9.tar.xz
+/cups-filters-1.19.0.tar.xz
diff --git a/cups-filters-location.patch b/cups-filters-location.patch
deleted file mode 100644
index a3035be..0000000
--- a/cups-filters-location.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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"))
diff --git a/cups-filters.spec b/cups-filters.spec
index 900a6b2..ce3832a 100644
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -3,8 +3,8 @@
 
 Summary: OpenPrinting CUPS filters and backends
 Name:    cups-filters
-Version: 1.17.9
-Release: 5%{?dist}
+Version: 1.19.0
+Release: 1%{?dist}
 
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@ -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
 
-Patch01: cups-filters-location.patch
-Patch02: cups-filters-createall.patch
+Patch01: cups-filters-createall.patch
 
 Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
 
@@ -105,8 +104,7 @@ This is the development package for OpenPrinting CUPS filters and backends.
 %prep
 %setup -q
 
-%patch01 -p1 -b .location
-%patch02 -p1 -b .createall
+%patch01 -p1 -b .createall
 
 
 %build
@@ -280,6 +278,9 @@ fi
 %{_libdir}/libfontembed.so
 
 %changelog
+* Tue Jan 16 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.19.0-1
+- Rebase to 1.19.0
+
 * Thu Jan 11 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.17.9-5
 - adding build dependency on ghostscript because of its package changes
 
diff --git a/sources b/sources
index 1392d50..00520aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cups-filters-1.17.9.tar.xz) = 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
+SHA512 (cups-filters-1.19.0.tar.xz) = 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30