diff --git a/backport-doxygen2man-Fix-typos-and-inconsistencies-in-help-te.patch b/backport-doxygen2man-Fix-typos-and-inconsistencies-in-help-te.patch new file mode 100644 index 0000000000000000000000000000000000000000..b3d16a72f2b0726647f445c571123f27ac59eddd --- /dev/null +++ b/backport-doxygen2man-Fix-typos-and-inconsistencies-in-help-te.patch @@ -0,0 +1,53 @@ +From 40542f314ebe7312fa995677ed5c967150dd5d6a Mon Sep 17 00:00:00 2001 +From: wferi +Date: Sat, 18 May 2024 17:12:47 +0200 +Subject: [PATCH 4/5] doxygen2man: Fix typos and inconsistencies in help text + (#497) + +--- + doxygen2man/doxygen2man.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/doxygen2man/doxygen2man.c b/doxygen2man/doxygen2man.c +index a90fefb..3197967 100644 +--- a/doxygen2man/doxygen2man.c ++++ b/doxygen2man/doxygen2man.c +@@ -1192,7 +1192,7 @@ static void usage(char *name) + printf(" using the name of the generated .xml file. This file will usually be called\n"); + printf(" something like _8h.xml, eg qbipcs_8h.xml\n"); + printf("\n"); +- printf(" If you want HTML output then simpy use nroff on the generated files as you\n"); ++ printf(" If you want HTML output then simply use nroff on the generated files as you\n"); + printf(" would do with any other man page.\n"); + printf("\n"); + printf(" -a Print ASCII dump of man pages to stdout\n"); +@@ -1200,18 +1200,18 @@ static void usage(char *name) + printf(" -P Print PARAMS section\n"); + printf(" -g Print general man page for the whole header file\n"); + printf(" -c Use the Copyright date from the header file (if one can be found)\n"); +- printf(" -O Directory for the orignal header file. Often needed by -c above\n"); +- printf(" -s Write man pages into section Use name. default \n"); +- printf(" -H
Set header (default \"Programmer's Manual\"\n"); ++ printf(" -O Directory for the original header file. Often needed by -c above\n"); ++ printf(" -s Write man pages into section (default: 3)\n"); ++ printf(" -p Use name (default: Package)\n"); ++ printf(" -H
Set header (default: \"Programmer's Manual\"\n"); + printf(" -I Set include filename (default taken from xml)\n"); +- printf(" -i Prefix for include files. eg qb/ (default \"\")\n"); +- printf(" -C Company name in copyright (defaults to Red Hat)\n"); ++ printf(" -i Prefix for include files. eg qb/ (nothing by default)\n"); ++ printf(" -C Company name in copyright (default: Red Hat)\n"); + printf(" -D Date to print at top of man pages (format not checked, default: today)\n"); + printf(" -S Start year to print at end of copyright line (default: 2010)\n"); + printf(" -Y Year to print at end of copyright line (default: today's year)\n"); +- printf(" -o Write all man pages to (default .)\n"); +- printf(" -d Directory for XML files (./xml/)\n"); ++ printf(" -o Write all man pages to (default: .)\n"); ++ printf(" -d Directory for XML files (default: ./xml/)\n"); + printf(" -h Print this usage text\n"); + } + +-- +2.25.1 + diff --git a/backport-doxygen2man-Include-libxml-parser.h-494.patch b/backport-doxygen2man-Include-libxml-parser.h-494.patch new file mode 100644 index 0000000000000000000000000000000000000000..3e369ab360bc7c970d509559e521955b4c77d5c7 --- /dev/null +++ b/backport-doxygen2man-Include-libxml-parser.h-494.patch @@ -0,0 +1,26 @@ +From c7528139dc8a6999fea65d94f7b8fbb424a6bd06 Mon Sep 17 00:00:00 2001 +From: Chrissie Caulfield +Date: Mon, 20 Nov 2023 12:15:21 +0000 +Subject: [PATCH 2/5] doxygen2man: Include libxml/parser.h (#494) + +This seems to be needed for newer versions of libxml +but shouldn't break older ones (CI to confirm!) +--- + doxygen2man/doxygen2man.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/doxygen2man/doxygen2man.c b/doxygen2man/doxygen2man.c +index 3dab47d..a90fefb 100644 +--- a/doxygen2man/doxygen2man.c ++++ b/doxygen2man/doxygen2man.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include "cstring.h" +-- +2.25.1 + diff --git a/libqb.spec b/libqb.spec index bb0a92a20e78bb185d05e04081229ff604a0bf65..65cd6411d198268ffd8f5e2d57ccebb46760ec98 100644 --- a/libqb.spec +++ b/libqb.spec @@ -1,12 +1,14 @@ Name: libqb Version: 2.0.8 -Release: 3 +Release: 4 Summary: Library providing high performance logging, tracing, ipc, and poll License: LGPLv2+ URL: https://github.com/ClusterLabs/libqb Source0: https://github.com/ClusterLabs/libqb/releases/download/v%{version}/%{name}-%{version}.tar.xz Patch0: Change-assert-in-ringbuffer-to-a-return-code-492.patch Patch1: Make-some-logs-less-noisy-495.patch +Patch2: backport-doxygen2man-Include-libxml-parser.h-494.patch +Patch3: backport-doxygen2man-Fix-typos-and-inconsistencies-in-help-te.patch BuildRequires: autoconf automake libtool check-devel doxygen gcc procps pkgconfig(glib-2.0) BuildRequires: git-core # For doxygen2man @@ -75,6 +77,10 @@ This package contains a program to create nicely-formatted man pages from Doxyge %{_mandir}/man1/doxygen2man.1.gz %changelog +* Thu Dec 05 2024 bixiaoyan - 2.0.8-4 +- doxygen2man: Include libxml/parser.h +- doxygen2man: Fix typos and inconsistencies in help text + * Wed Feb 21 2024 bixiaoyan - 2.0.8-3 - Make some logs less noisy Community Patch Link: