From fe3b18b31d6f40665f229a0f5f319199565209eb Mon Sep 17 00:00:00 2001 From: yaoguangzhong Date: Mon, 9 Jan 2023 14:39:43 +0800 Subject: [PATCH] backport Minor doc issues From: Robert Krawitz From commit 907f862a4e838207b7e2a673e18b4fbd998b8529 Signed-off-by: Guangzhong Yao --- gutenprint-Minor-doc-issues.patch | 25 +++++++++++++++++++++++++ gutenprint.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gutenprint-Minor-doc-issues.patch diff --git a/gutenprint-Minor-doc-issues.patch b/gutenprint-Minor-doc-issues.patch new file mode 100644 index 0000000..69a51fe --- /dev/null +++ b/gutenprint-Minor-doc-issues.patch @@ -0,0 +1,25 @@ +From 907f862a4e838207b7e2a673e18b4fbd998b8529 Mon Sep 17 00:00:00 2001 +From: Robert Krawitz +Date: Sun, 29 Jul 2018 10:33:24 -0400 +Subject: [PATCH] Minor doc issues + +--- + scripts/autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/autogen.sh b/scripts/autogen.sh +index c510dfcc..a5c580c0 100644 +--- a/scripts/autogen.sh ++++ b/scripts/autogen.sh +@@ -298,7 +298,7 @@ if test -d /usr/share/sgml/docbook ; then + fi + + { +- test -d "/usr/share/sgml/docbook_4" || test -d "/usr/share/sgml/docbook/dtd/4.0" || test -d "/usr/share/sgml/docbook_4.1" || test -n "$fedora_docbook" ++ test -d "/usr/share/sgml/docbook_4" || test -d "/usr/share/sgml/docbook/dtd/4.0" || test -d "/usr/share/sgml/docbook/dtd/4.1" || test -d "/usr/share/sgml/docbook_4.1" || test -n "$fedora_docbook" + } || { + echo " " + echo "***Warning***: You must have Docbook v4 installed to" +-- +2.39.0.windows.2 + diff --git a/gutenprint.spec b/gutenprint.spec index e8f3f7d..5cf2418 100644 --- a/gutenprint.spec +++ b/gutenprint.spec @@ -2,7 +2,7 @@ Name: gutenprint Version: 5.2.14 -Release: 7 +Release: 8 Summary: A suite of printer drivers License: GPLv2+ and MIT URL: http://gimp-print.sourceforge.net/ @@ -15,6 +15,7 @@ Patch3: gutenprint-yyin.patch Patch4: gutenprint-manpage.patch Patch5: gutenprint-python36syntax.patch Patch6: gutenprint-Add-Epson-Expression-ET-2600-EcoTank.patch +Patch7: gutenprint-Minor-doc-issues.patch %if %{with gimp} BuildRequires: pkgconfig(gimpui-2.0), gimp @@ -81,6 +82,7 @@ cp %{SOURCE1} src/cups/cups-genppdupdate.in sed -i -e 's,^#!/usr/bin/python3,#!%{__python3},' src/cups/cups-genppdupdate.in %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build sed -i -e 's,^\(TESTS *=.*\) run-weavetest,\1,' test/Makefile.in @@ -156,6 +158,9 @@ exit 0 %{_mandir}/man*/* %changelog +* Mon Jan 9 2023 yaoguangzhong - 5.2.14-8 +- backport Minor doc issues + * Sat Jan 7 2023 yaoguangzhong - 5.2.14-7 - backport add Epson Expression ET-2600 EcoTank