From 30151e07d747f1d20a0e2194b12e9a4e50da9ed3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 23 Jul 2025 13:29:18 +0200 Subject: [PATCH] RHEL-83060 lpinfo -m doesn't show textonly driver Resolves: RHEL-83060 --- cups-filters.spec | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/cups-filters.spec b/cups-filters.spec index 85ec6b2..4cc2aaf 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -6,6 +6,10 @@ %bcond_with braille %endif +# currently we use CUPS PPD compiler which will be removed +# in CUPS 3.0, then we will use PPD compiler from libppd-tools +%bcond_without cups_ppdc + # we build CUPS also with relro %global _hardened_build 1 @@ -13,7 +17,7 @@ Summary: OpenPrinting CUPS filters for CUPS 2.X Name: cups-filters Epoch: 1 Version: 2.0.0 -Release: 9%{?dist} +Release: 10%{?dist} # the CUPS exception text is the same as LLVM exception, so using that name with # agreement from legal team @@ -135,6 +139,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/ppd/cupsfilters/lftocrlf.p ln -sf %{_cups_serverbin}/filter/foomatic-rip %{buildroot}%{_bindir}/foomatic-rip #ln -sf %{_cups_serverbin}/filter/universal %{buildroot}%{_bindir}/foomatic-rip +%if %{with cups_ppdc} +mkdir -p %{buildroot}%{_datadir}/cups/ppdc +mv %{buildroot}%{_datadir}/{ppdc/pcl.h,cups/ppdc/pcl.h} +mv %{buildroot}%{_datadir}/{ppdc/escp.h,cups/ppdc/escp.h} +%endif + # remove license files which are in %%pkgdocdir rm -f %{buildroot}%{_pkgdocdir}/{COPYING,NOTICE,LICENSE} @@ -149,6 +159,15 @@ rm -f %{buildroot}%{_pkgdocdir}/CHANGES-1.x.md make check +%post +# remove PPD cache to make bz#2351389 fix work right away +# remove after F43 EOL +if [ $1 -gt 1 ] +then + rm -f /var/cache/cups/ppds.dat || : +fi + + %files %license COPYING LICENSE NOTICE %doc AUTHORS ABOUT-NLS CHANGES.md CONTRIBUTING.md DEVELOPING.md README.md @@ -190,11 +209,17 @@ make check %{_datadir}/cups/mime/cupsfilters-universal-postscript.convs %{_datadir}/cups/mime/cupsfilters-universal.convs %{_datadir}/ppd/cupsfilters +%if %{with cups_ppdc} # 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}/cups/ppdc/escp.h +%{_datadir}/cups/ppdc/pcl.h +%else +%dir %{_datadir}/ppdc %{_datadir}/ppdc/escp.h %{_datadir}/ppdc/pcl.h +%endif %{_mandir}/man1/foomatic-rip.1.gz %files driverless @@ -209,6 +234,9 @@ make check %changelog +* Wed Jul 23 2025 Zdenek Dohnal - 1:2.0.0-10 +- RHEL-83060 lpinfo -m doesn't show textonly driver + * Tue Oct 29 2024 Troy Dawson - 1:2.0.0-9 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018