diff --git a/cups-filters.spec b/cups-filters.spec index 99f7ff4..d6892b3 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -75,12 +75,6 @@ Patch19: 0001-gstoraster-Improved-detection-whether-input-is-PostS.patch Patch20: 0001-pdftopdf-Fixed-printing-multiple-copies-on-driverles.patch -# split cups-browsed and cups-filters-driverless from main package -# for LSB to have smaller set of brought dependencies -# RHEL-13211 -Conflicts: cups-browsed < 1.20.0-33 -Conflicts: cups-filters-driverless < 1.20.0-33 - %if %{with braille} Recommends: %{name}-braille%{?_isa} = %{version}-%{release} %endif @@ -117,6 +111,11 @@ BuildRequires: pkgconfig(ijs) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(lcms2) +# cups-browsed +BuildRequires: avahi-devel +BuildRequires: pkgconfig(avahi-glib) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: systemd # Make sure we get postscriptdriver tags. BuildRequires: python3-cups @@ -129,15 +128,6 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -# for driverless and cups-browsed -# discovering local IPP services and sharing them local printers -# via mDNS -BuildRequires: avahi-devel -# polling Avahi -BuildRequires: pkgconfig(avahi-glib) -# for dBUS proxy from GLib -BuildRequires: pkgconfig(glib-2.0) - Requires: cups-filesystem # poppler required for banner printing and with ghostscript needed when project # is configured with --with-pdftops=hybrid @@ -153,6 +143,18 @@ Requires: liberation-mono-fonts # pstopdf Requires: bc grep sed which +# cups-browsed +# it needs cups.service for running +Requires: cups +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + +# recommends avahi and cups-ipptool - it is needed for driverless support, +# but it is useless for older devices and cups servers +Recommends: avahi +Recommends: cups-ipptool + # older installations can still have ghostscript-cups and foomatic-filters # installed, but they are replaced by cups-filters now. We need to obsolete # them to have them uninstalled (#1632268) @@ -173,39 +175,6 @@ Summary: OpenPrinting CUPS filters and backends - development environment License: LGPLv2 and MIT Requires: cups-filters-libs%{?_isa} = %{version}-%{release} -%package -n cups-browsed -Summary: Daemon for local auto-installation of remote printers -License: LGPLv2+ -Conflicts: cups-filters < 1.20.0-33 -# systemd macros during build -BuildRequires: systemd -# needed if mDNS browsing and sharing is required -Recommends: avahi -# it needs cups.service for running -Requires: cups -# puts files into its dirs -Requires: cups-filesystem -# uses functions from libcupsfilters -Requires: cups-filters-libs%{?_isa} = %{version}-%{release} -# rpm scriptlets for the service file -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - -%package driverless -Summary: OpenPrinting driverless backends and drivers for CUPS 2.X -License: LGPLv2+ -Conflicts: cups-filters < 1.20.0-33 -# requires avahi and cups-ipptool - it is needed for driverless support, -# but it is useless for older devices and cups servers -Requires: avahi -# puts files into its dirs -Requires: cups-filesystem -# uses ippfind -Requires: cups-ipptool -# uses functions from libcupsfilters -Requires: cups-filters-libs%{?_isa} = %{version}-%{release} - %if %{with braille} %package braille Summary: OpenPrinting CUPS filters and backends - braille filters and backend @@ -235,19 +204,6 @@ This package provides cupsfilters and fontembed libraries. %description devel This is the development package for OpenPrinting CUPS filters and backends. -%description -n cups-browsed -cups-browsed is a helper daemon, which automatically installs printers -locally, provides load balancing and clustering of print queues. -The daemon installs the printers based on found mDNS records and CUPS -broadcast, or by polling a remote print server. - -%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. - %if %{with braille} %description braille The package provides filters and cups-brf backend needed for braille printing. @@ -375,13 +331,13 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/cups/data/testprint %check make check -%post -n cups-browsed +%post %systemd_post cups-browsed.service -%preun -n cups-browsed +%preun %systemd_preun cups-browsed.service -%postun -n cups-browsed +%postun %systemd_postun_with_restart cups-browsed.service %post libs -p /sbin/ldconfig @@ -393,9 +349,11 @@ make check %{_pkgdocdir}/README %{_pkgdocdir}/AUTHORS %{_pkgdocdir}/NEWS +%config(noreplace) %{_sysconfdir}/cups/cups-browsed.conf %attr(0755,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(0755,root,root) %{_cups_serverbin}/backend/implicitclass %attr(0755,root,root) %{_cups_serverbin}/backend/beh %attr(0755,root,root) %{_cups_serverbin}/filter/bannertopdf %attr(0755,root,root) %{_cups_serverbin}/filter/commandtoescpx @@ -423,6 +381,9 @@ make check %attr(0755,root,root) %{_cups_serverbin}/filter/texttops %attr(0755,root,root) %{_cups_serverbin}/filter/texttotext %{_bindir}/foomatic-rip +%{_bindir}/driverless +%{_cups_serverbin}/backend/driverless +%{_cups_serverbin}/driver/driverless %{_datadir}/cups/banners %{_datadir}/cups/charsets %{_datadir}/cups/data/* @@ -434,7 +395,12 @@ make check %{_datadir}/cups/mime/cupsfilters-ghostscript.convs %{_datadir}/cups/mime/cupsfilters-poppler.convs %{_datadir}/ppd/cupsfilters +%{_sbindir}/cups-browsed +%{_unitdir}/cups-browsed.service +%{_mandir}/man8/cups-browsed.8.gz +%{_mandir}/man5/cups-browsed.conf.5.gz %{_mandir}/man1/foomatic-rip.1.gz +%{_mandir}/man1/driverless.1.gz %files libs %dir %{_pkgdocdir}/ @@ -452,20 +418,6 @@ make check %{_libdir}/libcupsfilters.so %{_libdir}/libfontembed.so -%files -n cups-browsed -%config(noreplace) %{_sysconfdir}/cups/cups-browsed.conf -%attr(0755,root,root) %{_cups_serverbin}/backend/implicitclass -%{_sbindir}/cups-browsed -%{_unitdir}/cups-browsed.service -%{_mandir}/man8/cups-browsed.8.gz -%{_mandir}/man5/cups-browsed.conf.5.gz - -%files driverless -%{_bindir}/driverless -%{_cups_serverbin}/backend/driverless -%{_cups_serverbin}/driver/driverless -%{_mandir}/man1/driverless.1.gz - %if %{with braille} %files braille # cups-brf needs to be run as root, otherwise it leaves error messages @@ -513,7 +465,6 @@ make check * Tue Dec 19 2023 Zdenek Dohnal - 1.20.0-33 - RHEL-19433 Incorrect PS header handling in gstopdf - RHEL-16034 pdftopdf results with (N > 1)^2 copies if a file is sent to IPP printer with collate -- RHEL-13211 redhat-lsb unnecessary pulls in cups and avahi dependencies * Tue Aug 08 2023 Zdenek Dohnal - 1.20.0-32 - 2118406 - texttotext filter strips ESC causing PCL files to be printed improperly