PR#2: 2170538 - Rebase to 2.0b3 - rpms/cups-filters

rpms / cups-filters

#2 2170538 - Rebase to 2.0b3

Merged a year ago by zdohnal. Opened a year ago by zdohnal.

rpms/ zdohnal/cups-filters rebase_2.0b3 into rawhide

Zdenek Dohnal • a year ago

06431fc

.gitignore

file modified

		`@@ -111,3 +111,4 @@`
		`/cups-filters-1.28.14.tar.xz`
		`/cups-filters-1.28.15.tar.xz`
		`/cups-filters-1.28.16.tar.xz`
		`+ /cups-filters-2.0b3.tar.gz`

0001-Coverity-fixes.patch

file added

+146

		`@@ -0,0 +1,146 @@`
		`+ From 9ca26d04f170626a66a23cde3eac29dac7e89260 Mon Sep 17 00:00:00 2001`
		`+ From: Zdenek Dohnal <zdohnal@redhat.com>`
		`+ Date: Thu, 16 Feb 2023 15:49:10 +0100`
		`+ Subject: [PATCH] Coverity fixes 2`
		`+`
		`+ ---`
		`+ filter/foomatic-rip/foomaticrip.c \| 4 +++-`
		`+ filter/foomatic-rip/options.c \| 7 ++-----`
		`+ filter/foomatic-rip/postscript.c \| 11 +++++++----`
		`+ filter/rastertoescpx.c \| 3 +++`
		`+ utils/driverless.c \| 3 ++-`
		`+ 5 files changed, 17 insertions(+), 11 deletions(-)`
		`+`
		`+ diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c`
		`+ index b6abe4d33..036d6138b 100644`
		`+ --- a/filter/foomatic-rip/foomaticrip.c`
		`+ +++ b/filter/foomatic-rip/foomaticrip.c`
		`+ @@ -639,7 +639,7 @@ int`
		`+ print_file(const char *filename,`
		`+ int convert)`
		`+ {`
		`+ - FILE *file;`
		`+ + FILE *file = NULL;`
		`+ char buf[8192];`
		`+ char tmpfilename[PATH_MAX] = "";`
		`+ int type;`
		`+ @@ -664,6 +664,8 @@ print_file(const char *filename,`
		`+ n = fread_or_die(buf, 1, sizeof(buf) - 1, file);`
		`+ if (!n) {`
		`+ _log("Input is empty, outputting empty file.\n");`
		`+ + if (strcasecmp(filename, "<STDIN>"))`
		`+ + fclose(file);`
		`+ return (1);`
		`+ }`
		`+ buf[n] = '\0';`
		`+ diff --git a/filter/foomatic-rip/options.c b/filter/foomatic-rip/options.c`
		`+ index ae5bac2ed..bad833bc1 100644`
		`+ --- a/filter/foomatic-rip/options.c`
		`+ +++ b/filter/foomatic-rip/options.c`
		`+ @@ -1255,8 +1255,6 @@ option_has_choice(option_t *opt,`
		`+ const char *`
		`+ option_text(option_t *opt)`
		`+ {`
		`+ - if (isempty(opt->text))`
		`+ - return (opt->text);`
		`+ return (opt->text);`
		`+ }`
		`+`
		`+ @@ -2263,9 +2261,8 @@ ppd_supports_pdf()`
		`+ // line`
		`+ if (startswith(cmd, "gs"))`
		`+ {`
		`+ - strncpy(cmd_pdf, cmd, 4096);`
		`+ - if (strlen(cmd) > 4095)`
		`+ - cmd_pdf[4095] = '\0';`
		`+ + strncpy(cmd_pdf, cmd, 4095);`
		`+ + cmd_pdf[4095] = '\0';`
		`+ return (1);`
		`+ }`
		`+`
		`+ diff --git a/filter/foomatic-rip/postscript.c b/filter/foomatic-rip/postscript.c`
		`+ index b09c5b8ff..e6fbd2ac0 100644`
		`+ --- a/filter/foomatic-rip/postscript.c`
		`+ +++ b/filter/foomatic-rip/postscript.c`
		`+ @@ -178,17 +178,14 @@ print_ps(FILE *file,`
		`+ const char *filename)`
		`+ {`
		`+ stream_t stream;`
		`+ - char gscommand[65536];`
		`+ int pagefound = 0;`
		`+ FILE in, out;`
		`+ pid_t pid;`
		`+ - char buf[4096];`
		`+ struct pollfd pfd;`
		`+ size_t bytes, bytes_sent;`
		`+ char *pos;`
		`+ int pres;`
		`+ - dstr_t *line = create_dstr();`
		`+ - dstr_t *data_read = create_dstr();`
		`+ + dstr_t line = NULL, data_read = NULL;`
		`+`
		`+`
		`+ // Define input data stream for reading`
		`+ @@ -228,6 +225,11 @@ print_ps(FILE *file,`
		`+ // lines, we only need the boolean answer whether there are pages or`
		`+ // not`
		`+ //`
		`+ +`
		`+ + char buf[4096];`
		`+ + char gscommand[65536];`
		`+ + line = create_dstr();`
		`+ + data_read = create_dstr();`
		`+`
		`+ snprintf(gscommand, 65536, "%s -q -dNOPAUSE -dBATCH -sDEVICE=bbox -dDEVICEWIDTHPOINTS=1 -dDEVICEHEIGHTPOINTS=1 -_ 2>&1",`
		`+ CUPS_GHOSTSCRIPT);`
		`+ @@ -313,6 +315,7 @@ print_ps(FILE *file,`
		`+ _log("No pages left, outputting empty file.\n");`
		`+`
		`+ free_dstr(data_read);`
		`+ + free_dstr(line);`
		`+ }`
		`+`
		`+ return (1);`
		`+ diff --git a/filter/rastertoescpx.c b/filter/rastertoescpx.c`
		`+ index ccd599ea5..f060db0b3 100644`
		`+ --- a/filter/rastertoescpx.c`
		`+ +++ b/filter/rastertoescpx.c`
		`+ @@ -335,6 +335,9 @@ StartPage(ppd_file_t *ppd, // I - PPD file`
		`+ DitherLuts[6] = ppdLutLoad(ppd, colormodel, header->MediaType,`
		`+ resolution, "LightBlack", logfunc, ld);`
		`+ break;`
		`+ + default : // ERROR`
		`+ + fputs("ERROR: Unexpected number of channels\n", stderr);`
		`+ + exit(1);`
		`+ }`
		`+`
		`+ for (plane = 0; plane < PrinterPlanes; plane ++)`
		`+ diff --git a/utils/driverless.c b/utils/driverless.c`
		`+ index 8af843333..7c67cbe19 100644`
		`+ --- a/utils/driverless.c`
		`+ +++ b/utils/driverless.c`
		`+ @@ -495,19 +495,20 @@ list_printers (int mode, int reg_type_no, int isFax)`
		`+ if (fp) {`
		`+ while ((bytes = cupsFileGetLine(fp, buffer, sizeof(buffer))) > 0 \|\|`
		`+ (bytes < 0 && (errno == EAGAIN \|\| errno == EINTR))) {`
		`+ - ippfind_output = (char )malloc(MAX_OUTPUT_LEN(sizeof(char)));`
		`+ ptr = buffer;`
		`+ while (ptr && !isalnum(*ptr & 255)) ptr ++;`
		`+ if ((!strncasecmp(ptr, "ipps", 4) && ptr[4] == '\t')) {`
		`+ ptr += 4;`
		`+ *ptr = '\0';`
		`+ ptr ++;`
		`+ + ippfind_output = (char )malloc(MAX_OUTPUT_LEN(sizeof(char)));`
		`+ snprintf(ippfind_output, MAX_OUTPUT_LEN, "%s", ptr);`
		`+ cupsArrayAdd(service_uri_list_ipps, ippfind_output);`
		`+ } else if ((!strncasecmp(ptr, "ipp", 3) && ptr[3] == '\t')) {`
		`+ ptr += 3;`
		`+ *ptr = '\0';`
		`+ ptr ++;`
		`+ + ippfind_output = (char )malloc(MAX_OUTPUT_LEN(sizeof(char)));`
		`+ snprintf(ippfind_output, MAX_OUTPUT_LEN, "%s", ptr);`
		`+ cupsArrayAdd(service_uri_list_ipp, ippfind_output);`
		`+ } else`
		`+ --`
		`+ 2.39.2`
		`+`

0001-configure.ac-C-not-needed.patch

file added

+56

		`@@ -0,0 +1,56 @@`
		`+ From 6872a5bf03a8001169af2348cb97de9557eee4e7 Mon Sep 17 00:00:00 2001`
		`+ From: Zdenek Dohnal <zdohnal@redhat.com>`
		`+ Date: Thu, 2 Feb 2023 16:42:28 +0100`
		`+ Subject: [PATCH] configure.ac: C++ not needed`
		`+`
		`+ ---`
		`+ INSTALL \| 7 +++----`
		`+ configure.ac \| 5 +----`
		`+ 2 files changed, 4 insertions(+), 8 deletions(-)`
		`+`
		`+ diff --git a/INSTALL b/INSTALL`
		`+ index dd377fe54..f836bfa61 100644`
		`+ --- a/INSTALL`
		`+ +++ b/INSTALL`
		`+ @@ -16,10 +16,9 @@ found in "CHANGES.md".`
		`+`
		`+ BEFORE YOU BEGIN`
		`+`
		`+ - You'll need ANSI-compliant C and C++ compilers, plus a make program and`
		`+ - POSIX-compliant shell (/bin/sh). The GNU compiler tools and Bash work well`
		`+ - and we have tested the current CUPS code against several versions of GCC`
		`+ - with excellent results.`
		`+ + You'll need ANSI-compliant C, plus a make program and POSIX-compliant shell`
		`+ + (/bin/sh). The GNU compiler tools and Bash work well and we have tested`
		`+ + the current CUPS code against several versions of GCC with excellent results.`
		`+`
		`+ The Makefiles used by the project should work with most versions of make.`
		`+ We've tested them with GNU make as well as the make programs shipped by`
		`+ diff --git a/configure.ac b/configure.ac`
		`+ index a3606c30f..affe7008d 100644`
		`+ --- a/configure.ac`
		`+ +++ b/configure.ac`
		`+ @@ -19,7 +19,7 @@ m4_include([m4/ax_compare_version.m4])`
		`+ m4_include([m4/basic-directories.m4])`
		`+ AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2 subdir-objects foreign])`
		`+ AM_SILENT_RULES([yes])`
		`+ -AC_LANG([C++])`
		`+ +AC_LANG([C])`
		`+ AC_CONFIG_HEADERS([config.h])`
		`+ # Extra defines for the config.h`
		`+ AH_BOTTOM([`
		`+ @@ -50,11 +50,8 @@ AH_BOTTOM([`
		`+ # Find required base packages`
		`+ # ===========================`
		`+ AC_PROG_CC`
		`+ -AC_PROG_CXX`
		`+ -AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])`
		`+ AM_PROG_CC_C_O`
		`+ AM_ICONV`
		`+ -AC_PROG_CPP`
		`+ AC_PROG_INSTALL`
		`+ AC_PROG_LN_S`
		`+ AS_LN_SRF_PREPARE`
		`+ --`
		`+ 2.39.1`
		`+`

browsed-updatenetif.patch

file removed

-121

		`@@ -1,121 +0,0 @@`
		`- diff --git a/configure.ac b/configure.ac`
		`- index c1b108f..e921820 100644`
		`- --- a/configure.ac`
		`- +++ b/configure.ac`
		`- @@ -902,6 +902,16 @@ AC_ARG_WITH([shell],`
		`- )`
		`- AC_DEFINE_UNQUOTED([SHELL], "$with_shell", [Path for a modern shell])`
		`-`
		`- +AC_ARG_ENABLE([frequent_netif_update],`
		`- + [AS_HELP_STRING([--enable-frequent-netif-update], [Enable network interface update after each found entry to prevent network issues])],`
		`- + [FREQUENT_NETIF_UPDATE=$enableval],`
		`- + [FREQUENT_NETIF_UPDATE=yes]`
		`- +)`
		`- +`
		`- +AS_IF([test "x$FREQUENT_NETIF_UPDATE" != "xno"],`
		`- + [AC_DEFINE([FREQUENT_NETIF_UPDATE], [1], [Define whether we want network interface update after each found entry])]`
		`- +)`
		`- +`
		`- # =====================`
		`- # Prepare all .in files`
		`- # =====================`
		`- @@ -978,6 +988,7 @@ Build configuration:`
		`- pclm: ${enable_pclm}`
		`- local queue naming for remote CUPS queues: ${REMOTE_CUPS_LOCAL_QUEUE_NAMING}`
		`- keep generated queues during shutdown: ${SAVING_CREATED_QUEUES}`
		`- + update network interfaces after each found entry: ${FREQUENT_NETIF_UPDATE}`
		`- all ipp printer auto-setup: ${enable_auto_setup_all}`
		`- only driverless auto-setup: ${enable_auto_setup_driverless_only}`
		`- only local auto-setup: ${enable_auto_setup_local_only}`
		`- diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c`
		`- index 9971209..79ece21 100644`
		`- --- a/utils/cups-browsed.c`
		`- +++ b/utils/cups-browsed.c`
		`- @@ -490,6 +490,11 @@ static autoshutdown_inactivity_type_t autoshutdown_on = NO_QUEUES;`
		`- static guint autoshutdown_exec_id = 0;`
		`- static const char *default_printer = NULL;`
		`- static unsigned int notify_lease_duration = 86400;`
		`- +#ifdef FREQUENT_NETIF_UPDATE`
		`- +static int FrequentNetifUpdate = 1;`
		`- +#else`
		`- +static int FrequentNetifUpdate = 0;`
		`- +#endif`
		`-`
		`- static int debug_stderr = 0;`
		`- static int debug_logfile = 0;`
		`- @@ -9700,7 +9705,7 @@ examine_discovered_printer_record(const char *host,`
		`- or legacy CUPS, needed for the is_local_hostname() function calls.`
		`- During DNS-SD discovery the update is already done by the Avahi`
		`- event handler function. */`
		`- - if (type == NULL \|\| type[0] == '\0')`
		`- + if (FrequentNetifUpdate && (type == NULL \|\| type[0] == '\0'))`
		`- update_netifs(NULL);`
		`-`
		`- /* Check if we have already created a queue for the discovered`
		`- @@ -10100,9 +10105,11 @@ static void resolve_callback(AvahiServiceResolver *r,`
		`- strncpy(ifname, "Unknown", sizeof(ifname) - 1);`
		`- }`
		`-`
		`- + if (FrequentNetifUpdate)`
		`- + update_netifs(NULL);`
		`- +`
		`- /* Ignore local queues of the cupsd we are serving for, identifying them`
		`- via UUID */`
		`- - update_netifs(NULL);`
		`- if ((flags & AVAHI_LOOKUP_RESULT_LOCAL) \|\| !strcasecmp(ifname, "lo") \|\|`
		`- is_local_hostname(host_name)) {`
		`- update_local_printers ();`
		`- @@ -11967,6 +11974,13 @@ read_configuration (const char *filename)`
		`- else if (!strcasecmp(value, "no") \|\| !strcasecmp(value, "false") \|\|`
		`- !strcasecmp(value, "off") \|\| !strcasecmp(value, "0"))`
		`- AutoClustering = 0;`
		`- + } else if (!strcasecmp(line, "FrequentNetifUpdate") && value) {`
		`- + if (!strcasecmp(value, "yes") \|\| !strcasecmp(value, "true") \|\|`
		`- + !strcasecmp(value, "on") \|\| !strcasecmp(value, "1"))`
		`- + FrequentNetifUpdate = 1;`
		`- + else if (!strcasecmp(value, "no") \|\| !strcasecmp(value, "false") \|\|`
		`- + !strcasecmp(value, "off") \|\| !strcasecmp(value, "0"))`
		`- + FrequentNetifUpdate = 0;`
		`- } else if (!strcasecmp(line, "Cluster") && value) {`
		`- ptr = value;`
		`- ptr2 = NULL;`
		`- diff --git a/utils/cups-browsed.conf.5 b/utils/cups-browsed.conf.5`
		`- index 7e6ee3b..7f60168 100644`
		`- --- a/utils/cups-browsed.conf.5`
		`- +++ b/utils/cups-browsed.conf.5`
		`- @@ -1005,6 +1005,18 @@ and doing specific actions when a D-BUS notification comes.`
		`- NotifLeaseDuration 86400`
		`- .fam T`
		`- .fi`
		`- +FrequentNetifUpdate turns on/off the network interface update routines`
		`- +which happen for each found entry, which can slow up cups-browsed significantly`
		`- +if we are on a network with many shared printers or if we use BrowsePoll to a server`
		`- +with many queues. Network interface updates after receiving D-BUS notification`
		`- +from NetworkManager won't be turned off with the directive. The default value`
		`- +is 'Yes'.`
		`- +.PP`
		`- +.nf`
		`- +.fam C`
		`- + FrequentNetifUpdate Yes`
		`- +.fam T`
		`- +.fi`
		`- .SH SEE ALSO`
		`-`
		`- \fBcups-browsed\fP(8)`
		`- diff --git a/utils/cups-browsed.conf.in b/utils/cups-browsed.conf.in`
		`- index ee2f5bf..6866918 100644`
		`- --- a/utils/cups-browsed.conf.in`
		`- +++ b/utils/cups-browsed.conf.in`
		`- @@ -774,3 +774,12 @@ BrowseRemoteProtocols @BROWSEREMOTEPROTOCOLS@`
		`- # and doing specific actions when a D-BUS notification comes.`
		`-`
		`- # NotifLeaseDuration 86400`
		`- +`
		`- +# FrequentNetifUpdate turns on/off the network interface update routines`
		`- +# which happen for each found entry, which can slow up cups-browsed significantly`
		`- +# if we are on a network with many shared printers or if we use BrowsePoll to a server`
		`- +# with many queues. Network interface updates after receiving D-BUS notification`
		`- +# from NetworkManager won't be turned off with the directive. The default value`
		`- +# is 'Yes'.`
		`- +#`
		`- +# FrequentNetifUpdate Yes`

cups-filters.spec

file modified

+77 -302

		`@@ -1,170 +1,78 @@`
		`- # build braille subpackage on Fedora, don't do it on CentOS Stream 9 or older`
		`- %if 0%{?fedora} \|\| 0%{?rhel} > 9`
		`+ %if 0%{?fedora}`
		`+ %bcond_without mdns`
		`%bcond_without braille`
		`%else`
		`+ %bcond_with mdns`
		`%bcond_with braille`
		`%endif`

		`# we build CUPS also with relro`
		`%global _hardened_build 1`

		`- Summary: OpenPrinting CUPS filters and backends`
		`+`
		`+ Summary: OpenPrinting CUPS filters and backends for CUPS 2.X`
		`Name: cups-filters`
		`- Version: 1.28.16`
		`- Release: 7%{?dist}`
		`-`
		`- # For a breakdown of the licensing, see COPYING file`
		`- # GPLv2: filters: commandto, imagetoraster, pdftops, rasterto,`
		`- # imagetopdf, pstopdf, texttopdf`
		`- # backends: parallel, serial`
		`- # GPLv2+: filters: gstopxl, textonly, texttops, imagetops, foomatic-rip`
		`- # GPLv3: filters: bannertopdf`
		`- # GPLv3+: filters: urftopdf, rastertopdf`
		`- # LGPLv2+: utils: cups-browsed`
		`- # MIT: filters: gstoraster, pdftoijs, pdftoopvp, pdftopdf, pdftoraster`
		`- License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT and BSD with advertising`
		`-`
		`- Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters`
		`- Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz`
		`-`
		`- # backported from upstream`
		`- Patch0001: browsed-updatenetif.patch`
		`+ Version: 2.0b3`
		`+ Release: 1%{?dist}`
		`+`
		`+ # the CUPS exception text is the same as LLVM exception, so using that name with`
		`+ # agreement from legal team`
		`+ # https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/message/A7GFSD6M3GYGSI32L2FC5KB22DUAEQI3/`
		`+ License: Apache-2.0 WITH LLVM-exception`
		`+`
		`+ URL: https://github.com/OpenPrinting/cups-filters`
		`+ Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz`
		`+`
		`+`
		`+ # Patches`
		`+ # https://github.com/OpenPrinting/cups-filters/pull/504`
		`+ Patch0001: 0001-configure.ac-C-not-needed.patch`
		`+ # https://github.com/OpenPrinting/cups-filters/pull/510`
		`+ Patch0002: 0001-Coverity-fixes.patch`

		`- %if %{with braille}`
		`- # due moving texttobrf and textbrftoindexv3 to cups-filters-braille`
		`- # remove after F38 goes EOL and CentOS Stream 10 is released`
		`- Conflicts: cups-filters-braille < 1.28.16-3`
		`- %endif`

		`# autogen.sh`
		`BuildRequires: autoconf`
		`+ # autogen.sh`
		`BuildRequires: automake`
		`- BuildRequires: gettext-devel`
		`- BuildRequires: libtool`
		`-`
		`- # build requirements for build system:`
		`- # gcc for backends (implicitclass, parallel, serial, backend error handling)`
		`- # cupsfilters (colord, color manager...), filter (banners,`
		`- # commandto*, braille, foomatic-rip, imagetoraster, imagetopdf, gstoraster e.g.),`
		`- # fontembed, cups-browsed`
		`+ # filter binaries and backends are written in C`
		`BuildRequires: gcc`
		`- # gcc-c++ for pdftoopvp, pdftopdf`
		`- BuildRequires: gcc-c++`
		`+ # autogen.sh`
		`+ BuildRequires: gettext-devel`
		`# for autosetup`
		`BuildRequires: git-core`
		`+ # autogen.sh`
		`+ BuildRequires: libtool`
		`# uses make for compiling`
		`BuildRequires: make`
		`# we use pkgconfig to get a proper devel packages`
		`# proper CFLAGS and LDFLAGS`
		`BuildRequires: pkgconf-pkg-config`
		`-`
		`- # uses CUPS API functions - arrays, ipp functions`
		`- BuildRequires: cups-devel`
		`-`
		`- # pdftopdf`
		`- BuildRequires: pkgconfig(libqpdf)`
		`-`
		`- # pdftops`
		`- BuildRequires: poppler-utils`
		`-`
		`- # pdftoraster, gstoraster`
		`- BuildRequires: ghostscript`
		`- BuildRequires: libjpeg-turbo-devel`
		`- BuildRequires: libtiff-devel`
		`- BuildRequires: pkgconfig(dbus-1)`
		`- BuildRequires: pkgconfig(fontconfig)`
		`- BuildRequires: pkgconfig(freetype2)`
		`- BuildRequires: pkgconfig(lcms2)`
		`- # used for getting image resolution from images - they have`
		`- # EXIF data in them and library accesses it`
		`- BuildRequires: pkgconfig(libexif)`
		`- BuildRequires: pkgconfig(libpng)`
		`- BuildRequires: pkgconfig(poppler-cpp)`
		`- BuildRequires: pkgconfig(zlib)`
		`-`
		`- # cups-browsed`
		`- BuildRequires: avahi-devel`
		`- BuildRequires: pkgconfig(avahi-glib)`
		`- BuildRequires: pkgconfig(glib-2.0)`
		`- BuildRequires: systemd`
		`-`
		`+ # uses CUPS API`
		`+ BuildRequires: pkgconfig(cups) >= 2.2.2`
		`+ # uses cupsfilters API`
		`+ BuildRequires: pkgconfig(libcupsfilters) >= 2.0b3`
		`+ # uses PPD API`
		`+ BuildRequires: pkgconfig(libppd) >= 2.0b3`
		`# Make sure we get postscriptdriver tags.`
		`BuildRequires: python3-cups`

		`- # Testing font for test scripts.`
		`- BuildRequires: dejavu-sans-fonts`
		`-`
		`- # needed for systemd rpm macros in scriptlets`
		`- BuildRequires: systemd-rpm-macros`
		`-`
		`+ %if %{with braille}`
		`+ Recommends: braille-printer-app`
		`+ %endif`
		`+ # ippfind is used in driverless backend, not needed classic PPD based print queue`
		`+ Recommends: cups-ipptool`
		`# cups-browsed needs systemd-resolved or nss-mdns for resolving .local addresses of remote print queues`
		`# let's not require a specific package and let the user decide what he wants to use.`
		`# just recommend nss-mdns for Fedora for now to have working default, but`
		`# don't hardwire it for resolved users`
		`- %if 0%{?fedora}`
		`+ %if %{with mdns}`
		`Recommends: nss-mdns`
		`%endif`
		`- # Avahi is needed for device discovery for newer (2012+) devices and its sharing - make it recommended`
		`- Recommends: avahi`
		`- # ippfind is used in driverless backend, not needed classic PPD based print queue`
		`- Recommends: cups-ipptool`

		`- %if %{with braille}`
		`- # braille filters and backend`
		`- Recommends: %{name}-braille%{?_isa} = %{version}-%{release}`
		`- %endif`
		`-`
		`- # pstopdf`
		`- Requires: bc grep sed which`
		`- # for getting ICC profiles for filters (dbus must run)`
		`- Requires: colord`
		`+ # needs cups dirs`
		`Requires: cups-filesystem`
		`- # have the same libs for the package`
		`- Requires: cups-filters-libs%{?_isa} = %{version}-%{release}`
		`- # several filters calls 'gs' binary during filtering`
		`- Requires: ghostscript`
		`- # texttopdf`
		`- Requires: liberation-mono-fonts`
		`- # if --with-pdftops is set to hybrid, we use poppler filters for several printers`
		`- # and for printing banners, for other printers we need gs - ghostscript`
		`- Requires: poppler-utils`
		`-`
		`- # cups-browsed`
		`- # cups-browsed needs to have cups.service to run`
		`- Requires: cups`
		`- Requires(post): systemd`
		`- Requires(preun): systemd`
		`- Requires(postun): systemd`
		`-`
		`-`
		`- %package libs`
		`- Summary: OpenPrinting CUPS filters and backends - cupsfilters and fontembed libraries`
		`- # LGPLv2: libcupsfilters`
		`- # MIT: libfontembed`
		`- License: LGPLv2 and MIT`
		`-`
		`- %package devel`
		`- Summary: OpenPrinting CUPS filters and backends - development environment`
		`- License: LGPLv2 and MIT`
		`- Requires: cups-filters-libs%{?_isa} = %{version}-%{release}`

		`- %if %{with braille}`
		`- %package braille`
		`- Summary: OpenPrinting CUPS filters and backends - braille filters and backend`
		`- License: GPLv2+ and MIT`
		`- BuildRequires: liblouis-devel`
		`- # due moving texttobrf and textbrftoindexv3 to cups-filters-braille`
		`- # remove after F38 goes EOL and CentOS Stream 10 is released`
		`- Conflicts: cups-filters < 1.28.16-3`
		`- # we need classic pdftopdf and other filters as well`
		`- Requires: cups-filters%{?_isa} = %{version}-%{release}`
		`- # one of lou_translate (from liblouis-utils package) and`
		`- # file2brl (from liblouisutdml-utils package) is used for file conversions:`
		`- # => prefer lou_translate from liblouis-utils because liblouis-utils are in`
		`- # CentOS Stream`
		`- # liblouis-utils for lou_translate`
		`- Requires: liblouis-utils`
		`- %endif`

		`%description`
		`Contains backends, filters, and other software that was`
		`@@ -173,16 +81,6 @@`
		`independently of Apple, especially filters for the PDF-centric printing`
		`workflow introduced by OpenPrinting.`

		`- %description libs`
		`- This package provides cupsfilters and fontembed libraries.`
		`-`
		`- %description devel`
		`- This is the development package for OpenPrinting CUPS filters and backends.`
		`-`
		`- %if %{with braille}`
		`- %description braille`
		`- The package provides filters and cups-brf backend needed for braille printing.`
		`- %endif`

		`%prep`
		`%autosetup -S git`
		`@@ -191,114 +89,51 @@`
		`# work-around Rpath`
		`./autogen.sh`

		`- # --with-pdftops=hybrid - use Poppler's pdftops instead of Ghostscript for`
		`- # Brother, Minolta, and Konica Minolta to work around`
		`- # bugs in the printer's PS interpreters`
		`- # --with-rcdir=no - don't install SysV init script`
		`- # --enable-driverless - enable PPD generator for driverless printing in`
		`- # /usr/lib/cups/driver, it is for manual setup of`
		`- # driverless printers with printer setup tool`
		`- # --disable-static - do not build static libraries (becuase of Fedora Packaging`
		`- # Guidelines)`
		`- # --enable-dbus - enable DBus Connection Manager's code`
		`- # --disable-silent-rules - verbose build output`
		`- # --disable-mutool - mupdf is retired in Fedora, use qpdf`
		`- # --enable-pclm - support for pclm language`
		`- # --with-remote-cups-local-queue-naming=RemoteName - name created local queues, which point to`
		`- # remote CUPS queue, by its name from the server`
		`- # --disable-frequent-netif-update - cups-browsed can update its network interface data after every found printer,`
		`- # which slows down the printer creation - this disables it and leave the network`
		`- # interface update only after notification from NetworkManager`
		`-`
		`- %configure --disable-static \`
		`- --disable-silent-rules \`
		`- --with-pdftops=hybrid \`
		`- --enable-dbus \`
		`- --with-rcdir=no \`
		`+ %configure --enable-driverless \`
		`+ --enable-universal-cups-filter \`
		`--disable-mutool \`
		`- --enable-driverless \`
		`- --enable-pclm \`
		`- --with-apple-raster-filter=rastertopdf \`
		`- --with-remote-cups-local-queue-naming=RemoteName \`
		`- %if %{with braille}`
		`- --enable-braille \`
		`- %else`
		`- --disable-braille \`
		`- %endif`
		`- --disable-frequent-netif-update`
		`+ --disable-rpath \`
		`+ --disable-silent-rules \`
		`+ --disable-static`

		`%make_build`

		`%install`
		`%make_install`

		`- # Don't ship libtool la files.`
		`- rm -f %{buildroot}%{_libdir}/lib*.la`
		`+ # LSB3.2 requires /usr/bin/foomatic-rip,`
		`+ # create it temporarily as a relative symlink`
		`+ # (2.0b3) try using universal filter, it should have foomatic-rip functionality`
		`+ #ln -sf %{_cups_serverbin}/filter/foomatic-rip %{buildroot}%{_bindir}/foomatic-rip`
		`+ ln -sf %{_cups_serverbin}/filter/universal %{buildroot}%{_bindir}/foomatic-rip`

		`- # Not sure what is this good for.`
		`- rm -f %{buildroot}%{_bindir}/ttfread`
		`+ # remove license files which are in %%pkgdocdir`
		`+ rm -f %{buildroot}%{_pkgdocdir}/{COPYING,NOTICE,LICENSE}`

		`+ # remove INSTALL since it is unnecessary`
		`rm -f %{buildroot}%{_pkgdocdir}/INSTALL`
		`- mkdir -p %{buildroot}%{_pkgdocdir}/fontembed/`
		`- cp -p fontembed/README %{buildroot}%{_pkgdocdir}/fontembed/`

		`- # systemd unit file`
		`- mkdir -p %{buildroot}%{_unitdir}`
		`- install -p -m 644 utils/cups-browsed.service %{buildroot}%{_unitdir}`
		`+ # remove CHANGES-1.x.md, since it is carried by a dependency`
		`+ rm -f %{buildroot}%{_pkgdocdir}/CHANGES-1.x.md`

		`- # LSB3.2 requires /usr/bin/foomatic-rip,`
		`- # create it temporarily as a relative symlink`
		`- ln -sf %{_cups_serverbin}/filter/foomatic-rip %{buildroot}%{_bindir}/foomatic-rip`
		`+ # escp.h is not needed for runtime and nothing`


		`%check`
		`make check`

		`- %post`
		`- %systemd_post cups-browsed.service`
		`-`
		`- # put UpdateCUPSQueuesMaxPerCall and PauseBetweenCUPSQueueUpdates into cups-browsed.conf`
		`- # for making cups-browsed work more stable for environments with many print queues`
		`- # remove this after 1-2 releases`
		`- for directive in "UpdateCUPSQueuesMaxPerCall" "PauseBetweenCUPSQueueUpdates"`
		`- do`
		- found=`%{_bindir}/grep "^[[:blank:]]*$directive" %{_sysconfdir}/cups/cups-browsed.conf`
		`- if [ -z "$found" ]`
		`- then`
		`- if [ "x$directive" == "xUpdateCUPSQueuesMaxPerCall" ]`
		`- then`
		`- %{_bindir}/echo "UpdateCUPSQueuesMaxPerCall 20" >> %{_sysconfdir}/cups/cups-browsed.conf`
		`- else`
		`- %{_bindir}/echo "PauseBetweenCUPSQueueUpdates 5" >> %{_sysconfdir}/cups/cups-browsed.conf`
		`- fi`
		`- fi`
		`- done`
		`-`
		`- %preun`
		`- %systemd_preun cups-browsed.service`
		`-`
		`- %postun`
		`- %systemd_postun_with_restart cups-browsed.service`
		`-`
		`- %ldconfig_scriptlets libs`
		`-`

		`%files`
		`- %{_pkgdocdir}/README`
		`- %{_pkgdocdir}/ABOUT-NLS`
		`- %{_pkgdocdir}/AUTHORS`
		`- %{_pkgdocdir}/NEWS`
		`+ %license COPYING LICENSE NOTICE`
		`+ %doc AUTHORS ABOUT-NLS CHANGES.md CONTRIBUTING.md DEVELOPING.md README.md`
		`%{_bindir}/foomatic-rip`
		`%{_bindir}/driverless`
		`%{_bindir}/driverless-fax`
		`- %{_sbindir}/cups-browsed`
		`- %attr(0700,root,root) %{_cups_serverbin}/backend/beh`
		`- # implicitclass backend must be run as root`
		`- %attr(0700,root,root) %{_cups_serverbin}/backend/implicitclass`
		`+ %attr(0744,root,root) %{_cups_serverbin}/backend/beh`
		`# all backends needs to be run only as root because of kerberos`
		`- %attr(0700,root,root) %{_cups_serverbin}/backend/parallel`
		`+ %attr(0744,root,root) %{_cups_serverbin}/backend/parallel`
		`# Serial backend needs to run as root (bug #212577#c4).`
		`- %attr(0700,root,root) %{_cups_serverbin}/backend/serial`
		`+ %attr(0744,root,root) %{_cups_serverbin}/backend/serial`
		`%{_cups_serverbin}/backend/driverless`
		`%{_cups_serverbin}/backend/driverless-fax`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/bannertopdf`
		`@@ -311,101 +146,41 @@`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/imagetopdf`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/imagetops`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/imagetoraster`
		`+ %attr(0755,root,root) %{_cups_serverbin}/filter/pclmtoraster`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/pdftopdf`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/pdftops`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/pdftoraster`
		`+ %attr(0755,root,root) %{_cups_serverbin}/filter/pwgtopclm`
		`+ %attr(0755,root,root) %{_cups_serverbin}/filter/pwgtopdf`
		`+ %attr(0755,root,root) %{_cups_serverbin}/filter/pwgtoraster`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/rastertoescpx`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/rastertopclm`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/rastertopclx`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/rastertopdf`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/rastertops`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/sys5ippprinter`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/texttopdf`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/texttops`
		`%attr(0755,root,root) %{_cups_serverbin}/filter/texttotext`
		`+ %attr(0755,root,root) %{_cups_serverbin}/filter/universal`
		`%{_cups_serverbin}/driver/driverless`
		`%{_cups_serverbin}/driver/driverless-fax`
		`- %{_datadir}/cups/banners`
		`- %{_datadir}/cups/charsets`
		`- %{_datadir}/cups/data/*`
		`%{_datadir}/cups/drv/cupsfilters.drv`
		`%{_datadir}/cups/mime/cupsfilters.types`
		`%{_datadir}/cups/mime/cupsfilters.convs`
		`- %{_datadir}/cups/mime/cupsfilters-ghostscript.convs`
		`- %{_datadir}/cups/mime/cupsfilters-poppler.convs`
		`+ %{_datadir}/cups/mime/cupsfilters-universal-postscript.convs`
		`+ %{_datadir}/cups/mime/cupsfilters-universal.convs`
		`%{_datadir}/ppd/cupsfilters`
		`- # this needs to be in the main package because of cupsfilters.drv`
		`- %{_datadir}/cups/ppdc/pcl.h`
		`+ # escp.h and pcl.h are required during runtime, because`
		`+ # CUPS PPD compiler (ppdc) uses them for generating drivers`
		`+ # per request from cupsfilters.drv file`
		`+ %{_datadir}/ppdc/escp.h`
		`+ %{_datadir}/ppdc/pcl.h`
		`%{_mandir}/man1/foomatic-rip.1.gz`
		`%{_mandir}/man1/driverless.1.gz`
		`- %{_mandir}/man5/cups-browsed.conf.5.gz`
		`- %{_mandir}/man8/cups-browsed.8.gz`
		`- # 2123809 - rpm -Va reports changes due %post scriptlet (remove the verify part once we remove`
		`- # cups-browsed.conf update from %post)`
		`- %config(noreplace) %verify(not size filedigest mtime) %{_sysconfdir}/cups/cups-browsed.conf`
		`- %{_unitdir}/cups-browsed.service`
		`-`
		`- %files libs`
		`- %dir %{_pkgdocdir}/`
		`- %{_pkgdocdir}/COPYING`
		`- %dir %{_pkgdocdir}/fontembed`
		`- %{_pkgdocdir}/fontembed/README`
		`- %{_libdir}/libcupsfilters.so.1*`
		`- %{_libdir}/libfontembed.so.1*`
		`-`
		`- %files devel`
		`- %{_datadir}/cups/ppdc/escp.h`
		`- %{_includedir}/cupsfilters`
		`- %{_includedir}/fontembed`
		`- %{_libdir}/libcupsfilters.so`
		`- %{_libdir}/libfontembed.so`
		`- %{_libdir}/pkgconfig/libcupsfilters.pc`
		`- %{_libdir}/pkgconfig/libfontembed.pc`

		`- %if %{with braille}`
		`- %files braille`
		`- # cups-brf needs to be run as root, otherwise it leaves error messages`
		`- # in journal`
		`- %attr(0700,root,root) %{_cups_serverbin}/backend/cups-brf`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/brftoembosser`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/brftopagedbrf`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/imagetobrf`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/imageubrltoindexv3`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/imageubrltoindexv4`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/musicxmltobrf`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/textbrftoindexv3`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/texttobrf`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/vectortobrf`
		`- %attr(0755,root,root) %{_cups_serverbin}/filter/vectortopdf`
		`- %{_cups_serverbin}/filter/cgmtopdf`
		`- %{_cups_serverbin}/filter/cmxtopdf`
		`- %{_cups_serverbin}/filter/emftopdf`
		`- %{_cups_serverbin}/filter/imagetoubrl`
		`- %{_cups_serverbin}/filter/svgtopdf`
		`- %{_cups_serverbin}/filter/textbrftoindexv4`
		`- %{_cups_serverbin}/filter/vectortoubrl`
		`- %{_cups_serverbin}/filter/xfigtopdf`
		`- %{_cups_serverbin}/filter/wmftopdf`
		`- %{_datadir}/cups/braille`
		`- %{_datadir}/cups/drv/generic-brf.drv`
		`- %{_datadir}/cups/drv/generic-ubrl.drv`
		`- %{_datadir}/cups/drv/indexv3.drv`
		`- %{_datadir}/cups/drv/indexv4.drv`
		`- %{_datadir}/cups/ppdc/braille.defs`
		`- %{_datadir}/cups/ppdc/fr-braille.po`
		`- %{_datadir}/cups/ppdc/imagemagick.defs`
		`- %{_datadir}/cups/ppdc/index.defs`
		`- %{_datadir}/cups/ppdc/liblouis.defs`
		`- %{_datadir}/cups/ppdc/liblouis1.defs`
		`- %{_datadir}/cups/ppdc/liblouis2.defs`
		`- %{_datadir}/cups/ppdc/liblouis3.defs`
		`- %{_datadir}/cups/ppdc/liblouis4.defs`
		`- %{_datadir}/cups/ppdc/media-braille.defs`
		`- %{_datadir}/cups/mime/braille.convs`
		`- %{_datadir}/cups/mime/braille.types`
		`- %endif`

		`%changelog`
		`+ * Mon Feb 20 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2.0b3-1`
		`+ - 2170538 - rebase to 2.0b3`
		`+`
		`* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.16-7`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (cups-filters-1.28.16.tar.xz) = 0369f96a8ae5e33bf75c8765947d5ad7285b3532e9d9b0ded7e206798834c9ade3a2ac3f1d16e0fdd43346f2bc7852c541130e935cbb20f9c1239a53118d1239`
		`+ SHA512 (cups-filters-2.0b3.tar.gz) = a3667a05bcef3321b5901e08e6ff34a1f5366d5f2cf40a6767f7f5a66414baa724d82b36e58a2ea044a7b600af5798bdb265e012b8c86311318d052dd8fc6e8a`