From f0c5de2a54228ebcc87ebeac9db4afc023808cbf Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 19 Dec 2023 16:14:54 +0100
Subject: [PATCH] introduce cups-filters-driverless to strip avahi dependency
 for filters

---
 cups-filters.spec | 63 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/cups-filters.spec b/cups-filters.spec
index a52f0d3..8e0acdb 100644
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -9,11 +9,11 @@
 # we build CUPS also with relro
 %global _hardened_build 1
 
-Summary: OpenPrinting CUPS filters and backends for CUPS 2.X
+Summary: OpenPrinting CUPS filters for CUPS 2.X
 Name:    cups-filters
 Epoch:   1
 Version: 2.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # the CUPS exception text is the same as LLVM exception, so using that name with
 # agreement from legal team
@@ -29,6 +29,11 @@ Source2: lftocrlf
 # Patches
 
 
+# driverless backend/driver was moved into a separate package to
+# remove avahi dependency for filters
+# remove once C10S is released and F40 is EOL
+Conflicts: cups-filters-driverless < 2.0.0-3
+
 # autogen.sh
 BuildRequires: autoconf
 # autogen.sh
@@ -58,6 +63,28 @@ BuildRequires: python3-cups
 %if %{with braille}
 Recommends: braille-printer-app
 %endif
+# needs cups dirs
+Requires: cups-filesystem
+
+
+%description
+Contains backends, filters, and other software that was
+once part of the core CUPS distribution but is no longer maintained by
+Apple Inc. In addition it contains additional filters developed
+independently of Apple, especially filters for the PDF-centric printing
+workflow introduced by OpenPrinting.
+
+%package driverless
+Summary: OpenPrinting driverless backends and drivers for CUPS 2.X
+License: Apache-2.0 WITH LLVM-exception
+
+# backends and drivers has been moved from the main package to subpackage
+# to remove the avahi/mdns dependency needed for driverless
+# remove after F40 is EOL and C10S is released
+Conflicts: cups-filters < 2.0.0-3
+
+# finding device via driverless depends on running avahi-daemon
+Recommends: avahi
 # 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
@@ -71,14 +98,12 @@ Recommends: nss-mdns
 # needs cups dirs
 Requires: cups-filesystem
 
-
-%description
-Contains backends, filters, and other software that was
-once part of the core CUPS distribution but is no longer maintained by
-Apple Inc. In addition it contains additional filters developed
-independently of Apple, especially filters for the PDF-centric printing
-workflow introduced by OpenPrinting.
-
+%description driverless
+Contains backends and drivers for driverless implementation for cups-filters,
+which makes driverless printers to be seen when listing printers nearby and gives
+a specific generated driver for driverless printer in the local network. They are
+tools for backward compatibility with applications which don't handle CUPS temporary
+queues.
 
 %prep
 %autosetup -S git
@@ -128,15 +153,11 @@ make check
 %license COPYING LICENSE NOTICE
 %doc AUTHORS ABOUT-NLS CHANGES.md CONTRIBUTING.md DEVELOPING.md README.md
 %{_bindir}/foomatic-rip
-%{_bindir}/driverless
-%{_bindir}/driverless-fax
 %attr(0744,root,root) %{_cups_serverbin}/backend/beh
 # all backends needs to be run only as root because of kerberos
 %attr(0744,root,root) %{_cups_serverbin}/backend/parallel
 # Serial backend needs to run as root (bug #212577#c4).
 %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
 %attr(0755,root,root) %{_cups_serverbin}/filter/commandtoescpx
 %attr(0755,root,root) %{_cups_serverbin}/filter/commandtopclx
@@ -163,8 +184,6 @@ make check
 %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/drv/cupsfilters.drv
 %{_datadir}/cups/mime/cupsfilters.types
 %{_datadir}/cups/mime/cupsfilters.convs
@@ -177,10 +196,22 @@ make check
 %{_datadir}/ppdc/escp.h
 %{_datadir}/ppdc/pcl.h
 %{_mandir}/man1/foomatic-rip.1.gz
+
+%files driverless
+%license COPYING LICENSE NOTICE
+%{_bindir}/driverless
+%{_bindir}/driverless-fax
+%{_cups_serverbin}/backend/driverless
+%{_cups_serverbin}/backend/driverless-fax
+%{_cups_serverbin}/driver/driverless
+%{_cups_serverbin}/driver/driverless-fax
 %{_mandir}/man1/driverless.1.gz
 
 
 %changelog
+* Tue Dec 19 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.0.0-3
+- introduce cups-filters-driverless to strip avahi dependency for filters
+
 * Tue Dec 19 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.0.0-2
 - use exact foomatic-rip filter to comply with LSB