diff --git a/0001-cups-browsed.8-Remove-mentions-of-README-and-AUTHORS.patch b/0001-cups-browsed.8-Remove-mentions-of-README-and-AUTHORS.patch new file mode 100644 index 0000000..868d60f --- /dev/null +++ b/0001-cups-browsed.8-Remove-mentions-of-README-and-AUTHORS.patch @@ -0,0 +1,31 @@ +From 6b650f45b21e306db482221223584497a710b54d Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Mon, 15 Jun 2020 14:55:31 +0200 +Subject: [PATCH] cups-browsed.8: Remove mentions of README and AUTHORS files + +--- + utils/cups-browsed.8 | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/utils/cups-browsed.8 b/utils/cups-browsed.8 +index cc8374ce..73c2f686 100644 +--- a/utils/cups-browsed.8 ++++ b/utils/cups-browsed.8 +@@ -96,12 +96,8 @@ that clients running cups 1.6.x plus \fBcups-browsed\fP can use the CUPS + broadcasts from servers with cups 1.5.x. As with browsing of Bonjour + broadcasts, the created local raw queues are available to applications + and command line tools. ++.PP ++This manual page was written for the Debian Project, but it may be used by others. + .SH SEE ALSO + + \fBcups-browsed.conf\fP(5) +-.PP +-/usr/share/doc/\fBcups-browsed\fP/README.gz +-.SH AUTHOR +-The authors of \fBcups-browsed\fP are listed in /usr/share/doc/\fBcups-browsed\fP/AUTHORS. +-.PP +-This manual page was written for the Debian Project, but it may be used by others. +-- +2.26.2 + diff --git a/cups-browsed.8.patch b/cups-browsed.8.patch deleted file mode 100644 index 583c758..0000000 --- a/cups-browsed.8.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up cups-filters-1.20.0/utils/cups-browsed.8.manpage cups-filters-1.20.0/utils/cups-browsed.8 ---- cups-filters-1.20.0/utils/cups-browsed.8.manpage 2018-11-12 14:14:48.436062013 +0100 -+++ cups-filters-1.20.0/utils/cups-browsed.8 2018-11-12 14:19:10.188091043 +0100 -@@ -100,8 +100,8 @@ and command line tools. - - \fBcups-browsed.conf\fP(5) - .PP --/usr/share/doc/\fBcups-browsed\fP/README.gz -+/usr/share/doc/cups-filters/README.gz - .SH AUTHOR --The authors of \fBcups-browsed\fP are listed in /usr/share/doc/\fBcups-browsed\fP/AUTHORS. -+The authors of \fBcups-browsed\fP are listed in /usr/share/doc/cups-filters/AUTHORS. - .PP - This manual page was written for the Debian Project, but it may be used by others. diff --git a/cups-filters.spec b/cups-filters.spec index 7f59bfe..7a7740f 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -23,11 +23,8 @@ Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{versio # add configure option for local_queue_naming for remote CUPS queues # backported from upstream Patch01: 0001-configure.ac-Add-configure-option-for-local-queues-n.patch -# Links in man page is wrong - it shows 'cups-browsed' in path, but we -# have 'cups-filters' in path, because it is shipped in 'cups-filters' package -# instead of 'cups-browsed' as Ubuntu does. I can repack the project later, -# so cups-browsed would have separate sub package, so the link would be correct -Patch02: cups-browsed.8.patch +# remove bad paths in man page, backported from upstream +Patch02: 0001-cups-browsed.8-Remove-mentions-of-README-and-AUTHORS.patch # upstream decided on keep queues after restart - IMO it causes more issues than it # solves https://github.com/OpenPrinting/cups-filters/issues/241 Patch03: cups-filters-remove-queues-on-restart.patch @@ -326,6 +323,7 @@ done %changelog * Fri Aug 21 2020 Zdenek Dohnal - 1.27.5-7 - use configure option instead of downstream, cups-browsed.conf editing, patch +- the exact path in cups-browsed manpage was removed, use the patch removing it instead of downstream one * Wed Aug 19 2020 Zdenek Dohnal - 1.27.5-6 - 1867412 - cups-browsed leaks memory