diff --git a/.gitignore b/.gitignore index 6bbeb84..cfbec3f 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /cups-filters-1.20.0.tar.xz /cups-filters-1.20.1.tar.xz /cups-filters-1.20.2.tar.xz +/cups-filters-1.20.3.tar.xz diff --git a/cups-filters-no-txt.patch b/cups-filters-no-txt.patch deleted file mode 100644 index e63ae5c..0000000 --- a/cups-filters-no-txt.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up cups-filters-1.20.2/utils/cups-browsed.c.no-txt cups-filters-1.20.2/utils/cups-browsed.c ---- cups-filters-1.20.2/utils/cups-browsed.c.no-txt 2018-04-05 07:51:45.698241089 +0200 -+++ cups-filters-1.20.2/utils/cups-browsed.c 2018-04-05 07:57:28.117234138 +0200 -@@ -5333,6 +5333,11 @@ examine_discovered_printer_record(const - /* This is a remote CUPS queue or class */ - is_cups_queue = 1; - #endif /* HAVE_AVAHI */ -+ /* If we do not have a TXT record the printer was not discovered via -+ DNS-SD but via CUPS legacy or LDAP, so it is a remote CUPS queue -+ and not an IPP network printer. */ -+ if (txt == NULL) -+ is_cups_queue = 1; - if (is_cups_queue) { - debug_printf("Found CUPS queue/class: %s on host %s.\n", - strchr(resource, '/') + 1, remote_host); diff --git a/cups-filters.spec b/cups-filters.spec index 32a1b42..1100df2 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -3,7 +3,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters -Version: 1.20.2 +Version: 1.20.3 Release: 1%{?dist} # For a breakdown of the licensing, see COPYING file @@ -22,9 +22,6 @@ Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{versio Patch01: cups-filters-createall.patch -# upstream patches, remove with new release -Patch100: cups-filters-no-txt.patch - Requires: cups-filters-libs%{?_isa} = %{version}-%{release} # gcc and gcc-c++ is not in buildroot by default @@ -119,9 +116,6 @@ This is the development package for OpenPrinting CUPS filters and backends. # set LocalQueueNamingRemoteCUPS and CreateIPPPrinterQueues by default %patch01 -p1 -b .createall -# discover remote CUPS queues and LDAP queues (upstream https://github.com/OpenPrinting/cups-filters/issues/34) -%patch100 -p1 -b .no-txt - %build # work-around Rpath ./autogen.sh @@ -293,6 +287,9 @@ fi %{_libdir}/libfontembed.so %changelog +* Fri Apr 13 2018 Zdenek Dohnal - 1.20.3-1 +- 1.20.3 + * Wed Apr 04 2018 Zdenek Dohnal - 1.20.2-1 - 1.20.2 - fixing discovering of remote CUPS queues and LDAP queues diff --git a/sources b/sources index 9c8e5e9..9fe1bef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cups-filters-1.20.2.tar.xz) = 94cc2a452b8dc1ed5f03b98e0530d7489dd5a369413b0ab0e7b054fcb198e8fee283507de2ef836df8ce9fb7f217794737fa4851baba72e5b79e38ad02ee61ea +SHA512 (cups-filters-1.20.3.tar.xz) = 402a53bf1ea12b14e6f8aa46f8f5e91b2caf9da3a8f14759568b5a45b9309f379fec542c843da5560cbcec2c4860babfee7e9c2f0c62f5fa6254025e9d867b31