add back lspp patch

(cherry picked from commit 1f1ffc8a1d3b08f900ad3a2ee5001e5e40969641)

cups.spec

@@ -3,7 +3,7 @@
 Name:    cups
 Epoch:   1
 Version: 2.4.7
-Release: 5
+Release: 6
 Summary: CUPS is the standards-based, open source printing system for linux operating systems.
 License: Apache-2.0
 Url:     https://openprinting.github.io/cups/
@@ -23,6 +23,7 @@ Patch7:  cups-uri-compat.patch
 Patch8:  cups-freebind.patch
 Patch9:  cups-ipp-multifile.patch
 Patch10: cups-web-devices-timeout.patch
+Patch11: cups-lspp.patch
 
 Patch6004: fix-httpAddrGetList-test-case-fail.patch
 Patch6005: backport-Fix-CVE-2024-35235.patch
@@ -341,21 +342,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
@@ -384,9 +370,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
@@ -417,7 +400,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
  
@@ -426,21 +408,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
@@ -455,6 +431,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.7-6
+- fix file conflicts regarding man pages
+- add back lspp patch
+
 * Tue Oct 8 2024 zhangpan <zhangpan103@h-partners.com> - 1:2.4.7-5
 - fix CVE-2024-47175
 

cups.yaml

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