From 84a28971d9b2e48c943602978a8af683b63d51c8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 21 Jun 2021 11:40:01 +0200 Subject: [PATCH] 1.28.9 --- .gitignore | 1 + ...ays-save-.-default-option-entries-fr.patch | 29 ------------------- cups-filters.spec | 10 ++++--- sources | 2 +- 4 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 0001-cups-browsed-Always-save-.-default-option-entries-fr.patch diff --git a/.gitignore b/.gitignore index 1383f6a..2fc311c 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ /cups-filters-1.28.6.tar.xz /cups-filters-1.28.7.tar.xz /cups-filters-1.28.8.tar.xz +/cups-filters-1.28.9.tar.xz diff --git a/0001-cups-browsed-Always-save-.-default-option-entries-fr.patch b/0001-cups-browsed-Always-save-.-default-option-entries-fr.patch deleted file mode 100644 index 98fe409..0000000 --- a/0001-cups-browsed-Always-save-.-default-option-entries-fr.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 144322be6e06ff12f101fc35e472d62978861e28 Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -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/cups-filters.spec b/cups-filters.spec index ee6ba05..f4b7493 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -3,8 +3,8 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters -Version: 1.28.8 -Release: 2%{?dist} +Version: 1.28.9 +Release: 1%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -21,10 +21,9 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz # backported from upstream -Patch01: 0001-cups-browsed-Always-save-.-default-option-entries-fr.patch # 1973056 - renew dbus notifications in the half of time # upstream https://github.com/OpenPrinting/cups-filters/commit/d90a4fc57b00b4a1f6c196bcb96025251b555dd9 -Patch02: 0001-cups-browsed.c-Make-NotifLeaseDuration-configurable-.patch +Patch01: 0001-cups-browsed.c-Make-NotifLeaseDuration-configurable-.patch # autogen.sh @@ -352,6 +351,9 @@ done %{_libdir}/pkgconfig/libfontembed.pc %changelog +* Mon Jun 21 2021 Zdenek Dohnal - 1.28.9-1 +- 1.28.9 + * Mon Jun 21 2021 Zdenek Dohnal - 1.28.8-2 - 1973056 - cups-browsed doesn't renew DBus subscription in time and all printing comes to a halt diff --git a/sources b/sources index 5e7055a..b3b3063 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cups-filters-1.28.8.tar.xz) = 77b39ce2a30ad44d50aa58964b389fa5dd75b2b4307ccb25996050fd176e1e794ad0a66ddd4de76e95a671683c3bf448a4f471272c97a752f25ff6234f7d8511 +SHA512 (cups-filters-1.28.9.tar.xz) = fbdf01b0a3acd70e3bf036ca4944a8b85ab4ab95d945458e924692008a8a37bb0b1fb097c4d4b3cf6f5ad68ae06e8358659cdfc24974ee629be37b54f5c3dca1