From 5623e5858422f9f286de6d75b54d2083ae0259d4 Mon Sep 17 00:00:00 2001 From: wxiat Date: Wed, 28 Jun 2023 10:03:47 +0800 Subject: [PATCH] add sw Signed-off-by: wxiat --- 0001-mandb-add-sw.patch | 43 +++++++++++++++++++++++++++++++++++++++++ man-db.spec | 7 ++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-mandb-add-sw.patch diff --git a/0001-mandb-add-sw.patch b/0001-mandb-add-sw.patch new file mode 100644 index 0000000..3fdff38 --- /dev/null +++ b/0001-mandb-add-sw.patch @@ -0,0 +1,43 @@ +From ad2d12e1071ad93b932c04d87520536068d99ff2 Mon Sep 17 00:00:00 2001 +From: wxiat +Date: Mon, 26 Jun 2023 17:19:38 +0800 +Subject: [PATCH] add sw + +Signed-off-by: wxiat +--- + include/manconfig.h.in | 2 +- + src/zsoelim.l | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/include/manconfig.h.in b/include/manconfig.h.in +index 708341b..a07c10a 100644 +--- a/include/manconfig.h.in ++++ b/include/manconfig.h.in +@@ -54,7 +54,7 @@ + DEFAULT_MANROFFSEQ can be overridden by command line arguments to man, the + environment variable $MANROFFSEQ, and by the manual page being formatted. */ + +-#if defined (__hpux) || (defined (__alpha) && !defined(__GLIBC__)) ++#if defined (__hpux) || ((defined (__alpha) ||defined (__sw_64))&& !defined(__GLIBC__)) + # define DEFAULT_MANROFFSEQ "te" + #elif defined (__ultrix) + # define DEFAULT_MANROFFSEQ "t" +diff --git a/src/zsoelim.l b/src/zsoelim.l +index b3dc780..ac4ecc1 100644 +--- a/src/zsoelim.l ++++ b/src/zsoelim.l +@@ -183,6 +183,11 @@ W [ \t] + _("%s:%d: warning: failed .so request"), + NAME, LINE); + printf (".so %s\n", yytext); ++#elif !defined __sw_64 ++ error (OK, 0, ++ _("%s:%d: warning: failed .so request"), ++ NAME, LINE); ++ printf (".so %s\n", yytext); + #endif + BEGIN (end_request); + } else { +-- +2.31.1 + diff --git a/man-db.spec b/man-db.spec index 4702383..24965fe 100644 --- a/man-db.spec +++ b/man-db.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %global cache /var/cache/man %global gnulib_ver 20140202 @@ -27,6 +27,8 @@ Patch2: man-db-2.7.6.1-fix_rhbz1495507.patch Patch3: man-db-2.7.6.1-coverity.patch +Patch4: 0001-mandb-add-sw.patch + Obsoletes: man < 2.0 Provides: man = %{version} Provides: man-pages-reader = %{version} @@ -199,6 +201,9 @@ fi %doc README man-db-manual.txt man-db-manual.ps ChangeLog NEWS %changelog +* Mon Jun 26 2023 wxiat - 2.7.6.1-18.0.2 +- add sw patch + * Fri Jul 15 2022 Weisson - 2.7.6.1-18.0.1 - Add doc sub package -- Gitee