add back lspp patch

(cherry picked from commit 0c4f609cf3fd4bd0b7d3dada67941db49ab0ebcc)

cups.spec

@@ -3,7 +3,7 @@
 Name:    cups
 Epoch:   1
 Version: 2.4.0
-Release: 13
+Release: 14
 Summary: CUPS is the standards-based, open source printing system for linux operating systems.
 License: Apache-2.0 WITH LLVM-exception
 Url:     https://openprinting.github.io/cups/
@@ -38,6 +38,7 @@ Patch6010: backport-0002-CVE-2024-47175.patch
 Patch6011: backport-0003-CVE-2024-47175.patch
 Patch6012: backport-0004-CVE-2024-47175.patch
 Patch6013: backport-0005-CVE-2024-47175.patch
+Patch6014: cups-lspp.patch
 
 BuildRequires: pam-devel pkgconf-pkg-config pkgconfig(gnutls) libacl-devel openldap-devel pkgconfig(libusb-1.0)
 BuildRequires: krb5-devel pkgconfig(avahi-client) systemd pkgconfig(libsystemd) pkgconfig(dbus-1) python3-cups
@@ -346,21 +347,6 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb
 %dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp
 %dir %attr(0710,root,lp) %{_localstatedir}/spool/cups
 %dir %attr(0755,root,lp) %{_localstatedir}/log/cups
-# client subpackage
-%exclude %{_mandir}/man1/lp*.1.gz
-%exclude %{_mandir}/man1/cancel-cups.1.gz
-%exclude %{_mandir}/man8/lpc-cups.8.gz
-# devel subpackage
-%exclude %{_mandir}/man1/cups-config.1.gz
-# ipptool subpackage
-%exclude %{_mandir}/man1/ipptool.1.gz
-%exclude %{_mandir}/man5/ipptoolfile.5.gz
-# lpd subpackage
-%exclude %{_mandir}/man8/cups-lpd.8.gz
-# printerapp
-%exclude %{_mandir}/man1/ippeveprinter.1.gz
-%exclude %{_mandir}/man7/ippevepcl.7.gz
-%exclude %{_mandir}/man7/ippeveps.7.gz
 %dir %attr(0755,root,lp) %{_rundir}/cups
 %dir %attr(0511,lp,sys) %{_rundir}/cups/certs
 %dir %attr(0755,root,lp) %{_sysconfdir}/cups
@@ -389,9 +375,6 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb
 %{_bindir}/cancel*
 %{_bindir}/lp*
 %{_sbindir}/lpc.cups
-%{_mandir}/man1/cancel-cups.1.gz
-%{_mandir}/man1/lp*.1.gz
-%{_mandir}/man8/lpc-cups.8.gz
  
 %files libs
 %{license} LICENSE
@@ -421,7 +404,6 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb
  
 %files lpd
 %{cups_serverbin}/daemon/cups-lpd
-%{_mandir}/man8/cups-lpd.8.gz
 %attr(0644, root, root)%{_unitdir}/cups-lpd.socket
 %attr(0644, root, root)%{_unitdir}/cups-lpd@.service
  
@@ -430,21 +412,15 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb
 %{_bindir}/ipptool
 %dir %{_datadir}/cups/ipptool
 %{_datadir}/cups/ipptool/*
-%{_mandir}/man1/ipptool.1.gz
-%{_mandir}/man5/ipptoolfile.5.gz
  
 %files printerapp
 %{_bindir}/ippeveprinter
 %dir %{cups_serverbin}/command
 %{cups_serverbin}/command/ippevepcl
 %{cups_serverbin}/command/ippeveps
-%{_mandir}/man1/ippeveprinter.1.gz
-%{_mandir}/man7/ippevepcl.7.gz
-%{_mandir}/man7/ippeveps.7.gz
 
 %files help
-%{_mandir}/man[1578]/*
-%{_mandir}/man1/cups-config.1.gz
+%{_mandir}/man?/*
 %doc README.md CREDITS.md CHANGES.md
 %doc %{_datadir}/%{name}/www/index.html
 %doc %{_datadir}/%{name}/www/help
@@ -459,6 +435,10 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb
 %doc %{_datadir}/%{name}/www/apple-touch-icon.png
 
 %changelog
+* Sat Oct 12 2024 Funda Wang <fundawang@yeah.net> - 1:2.4.0-14
+- fix file conflicts regarding man pages
+- add back lspp patch
+
 * Tue Oct 8 2024 zhangpan <zhangpan103@h-partners.com> - 1:2.4.0-13
 - fix CVE-2024-47175
 

cups.yaml

@@ -1,4 +1,4 @@
 version_control: github
-src_repo: apple/cups
+src_repo: OpenPrinting/cups
 tag_prefix: ^v
-seperator: .
+separator: .