rpms/cups-filters
6
0
Fork 0
Code Issues Pull Requests Releases Activity

1954523 - cups-browsed doesn't save "*-default" options

Browse Source 
Resolves: rhbz#1954523
This commit is contained in:
Zdenek Dohnal 2021-05-20 13:47:58 +02:00
parent d12d35bd6a
commit 90a07d21d5
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-cups-browsed-Always-save-.-default-option-entries-fr.patch Normal file
View File

@ -0,0 +1,29 @@
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

8
cups-filters.spec
View File

@ -4,7 +4,7 @@
Summary: OpenPrinting CUPS filters and backends
Name: cups-filters
Version: 1.28.7
Release: 6%{?dist}
Release: 7%{?dist}
# For a breakdown of the licensing, see COPYING file
# GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*,
@ -22,6 +22,9 @@ Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{versio
# backported from upstream
#Patch01: 0001-libcupsfilters-In-the-PPD-generator-really-give-prio.patch
# 1954523 - cups-browsed doesn't save "*-default" options
# upstream https://github.com/OpenPrinting/cups-filters/commit/cdd61132e1719a88dd8006c65e8e260c1aaa02e4
Patch01: 0001-cups-browsed-Always-save-.-default-option-entries-fr.patch
# autogen.sh
@ -349,6 +352,9 @@ done
%{_libdir}/pkgconfig/libfontembed.pc
%changelog
* Thu May 20 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1.28.7-7
- 1954523 - cups-browsed doesn't save "*-default" options
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.28.7-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937