From c5d4285848e7568b447908ddce209914cdf20309 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 09 2021 04:16:26 +0000
Subject: import cups-filters-1.20.0-25.el8


---

diff --git a/SOURCES/0001-cups-browsed-Always-save-.-default-option-entries-fr.patch b/SOURCES/0001-cups-browsed-Always-save-.-default-option-entries-fr.patch
new file mode 100644
index 0000000..1b871e6
--- /dev/null
+++ b/SOURCES/0001-cups-browsed-Always-save-.-default-option-entries-fr.patch
@@ -0,0 +1,28 @@
+From 144322be6e06ff12f101fc35e472d62978861e28 Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Thu, 15 Apr 2021 14:26:44 +0200
+Subject: [PATCH] cups-browsed: Always save "...-default" option entries from
+ printers.conf
+
+(cherry picked from commit cdd61132e1719a88dd8006c65e8e260c1aaa02e4)
+---
+ utils/cups-browsed.c | 4 +---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
+index bffd1e09..0c335055 100644
+--- a/utils/cups-browsed.c
++++ b/utils/cups-browsed.c
+@@ -5648,9 +5648,7 @@ record_printer_options(const char *printer) {
+	       strcasecmp(key + strlen(key) - strlen(*ptr) + 1, *ptr + 1) == 0))
+	    break;
+	if (*ptr != NULL) {
+-	  if (strcasecmp(key, CUPS_BROWSED_DEST_PRINTER "-default") != 0 &&
+-	      (ppdname == NULL ||
+-	       strncasecmp(key + strlen(key) - 8, "-default", 8))) {
++	  if (strcasecmp(key, CUPS_BROWSED_DEST_PRINTER "-default") != 0) {
+	    ippAttributeString(attr, buf, sizeof(buf));
+	    buf[sizeof(buf) - 1] = '\0';
+	    c = buf;
+--
+2.30.2
diff --git a/SPECS/cups-filters.spec b/SPECS/cups-filters.spec
index 5f471ae..93c449c 100644
--- a/SPECS/cups-filters.spec
+++ b/SPECS/cups-filters.spec
@@ -4,7 +4,7 @@
 Summary: OpenPrinting CUPS filters and backends
 Name:    cups-filters
 Version: 1.20.0
-Release: 24%{?dist}
+Release: 25%{?dist}
 
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@ -49,6 +49,8 @@ Patch11: foomatic-remove-tmpfile.patch
 Patch12: poppler-20.11.0.patch
 # 1894543 - Fix '.setfilladjust' usage after gs upgrade to 9.27
 Patch13: 0001-gstoraster-Use-.setfilladjust2-PostScript-command-fo.patch
+# 1931603 - cups-browsed doesn't save "-default" options
+Patch14: 0001-cups-browsed-Always-save-.-default-option-entries-fr.patch
 
 Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
 
@@ -187,6 +189,9 @@ This is the development package for OpenPrinting CUPS filters and backends.
 %patch12 -p1 -b .poppler2011
 # 1894543 - Fix '.setfilladjust' usage after gs upgrade to 9.27
 %patch13 -p1 -b .setfilladjust
+# 1931603 - cups-browsed doesn't save "-default" options
+%patch14 -p1 -b .cups-browsed-save-default-options
+
 
 %build
 # work-around Rpath
@@ -333,6 +338,9 @@ make check
 %{_libdir}/libfontembed.so
 
 %changelog
+* Thu Jun 03 2021 Richard Lescak <zdohnal@redhat.com> - 1.20.0-25
+- 1931603 - cups-browsed doesn't save "*-default" options
+
 * Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.20.0-24
 - require the explicit gs version