diff --git a/13a8894fe2.patch b/13a8894fe2.patch new file mode 100644 index 0000000..ca2b774 --- /dev/null +++ b/13a8894fe2.patch @@ -0,0 +1,15 @@ +diff --git a/tp/Texinfo/XS/parsetexi/end_line.c b/tp/Texinfo/XS/parsetexi/end_line.c +index a5bd0ce..c973cc1 100644 +--- a/tp/Texinfo/XS/parsetexi/end_line.c ++++ b/tp/Texinfo/XS/parsetexi/end_line.c +@@ -778,8 +778,8 @@ kdbinputstyle_invalid: + case CM_headings: + { + if (!strcmp (line, "off") || !strcmp (line, "on") +- || !strcmp (line, "double") || !strcmp (line, "singleafter") +- || !strcmp (line, "doubleafter")) ++ || !strcmp (line, "single") || !strcmp (line, "double") ++ || !strcmp (line, "singleafter") || !strcmp (line, "doubleafter")) + { + ADD_ARG(line); + } diff --git a/texinfo-6.7.tar.xz b/texinfo-6.7.tar.xz deleted file mode 100644 index 0d6b929..0000000 --- a/texinfo-6.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa -size 4337984 diff --git a/texinfo-6.7.tar.xz.sig b/texinfo-6.7.tar.xz.sig deleted file mode 100644 index d17aea5..0000000 --- a/texinfo-6.7.tar.xz.sig +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCXYpOxhkcZ2F2aW5zbWl0 -aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upFfsA/ijrBDSblwgcANew2xreyJMk -2oicyeBfOWwiSbjlBNSsAP4+mM2vwqo2CAHqUd2CHGV0tz/FnU7SxPrOdJneUIc2 -xQ== -=5SpL ------END PGP SIGNATURE----- diff --git a/texinfo-6.8.tar.xz b/texinfo-6.8.tar.xz new file mode 100644 index 0000000..736516b --- /dev/null +++ b/texinfo-6.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4 +size 4961528 diff --git a/texinfo-6.8.tar.xz.sig b/texinfo-6.8.tar.xz.sig new file mode 100644 index 0000000..eef3c4e --- /dev/null +++ b/texinfo-6.8.tar.xz.sig @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- + +iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCYOBI7hkcZ2F2aW5zbWl0 +aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upvZEA/R2uZA180mjPpl2kesisoFr7 +FgWLsI5pBkoW9zkQgHLFAP4+A356Y3n3KGzrJaekeDZaeyn+BxXxVWrzNEIP6Tvq +WA== +=xAUQ +-----END PGP SIGNATURE----- diff --git a/texinfo-zlib.patch b/texinfo-zlib.patch index 102733b..c8bc3e7 100644 --- a/texinfo-zlib.patch +++ b/texinfo-zlib.patch @@ -1,23 +1,6 @@ -Index: texinfo-6.6/install-info/Makefile.in -=================================================================== ---- - texinfo-6.6/install-info/Makefile.in | 2 - - texinfo-6.6/install-info/install-info.c | 54 ++++++++++++++++++++++++-------- - 2 files changed, 42 insertions(+), 14 deletions(-) - ---- texinfo-6.6/install-info/Makefile.in -+++ texinfo-6.6/install-info/Makefile.in 2019-09-27 08:03:19.381937177 +0000 -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lzio - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ---- texinfo-6.6/install-info/install-info.c -+++ texinfo-6.6/install-info/install-info.c 2019-09-27 08:52:36.071070583 +0000 +diff -Nur texinfo-6.8/install-info/install-info.c new/install-info/install-info.c +--- texinfo-6.8/install-info/install-info.c 2021-06-15 22:02:27.000000000 +0200 ++++ new/install-info/install-info.c 2022-04-25 12:38:13.573744683 +0200 @@ -19,6 +19,7 @@ #include #include @@ -26,20 +9,23 @@ Index: texinfo-6.6/install-info/Makefile.in #define TAB_WIDTH 8 -@@ -858,20 +859,33 @@ determine_file_type: - return 0; +@@ -852,22 +853,33 @@ if (*compression_program) -- { /* It's compressed, so open a pipe. */ + { +- /* Redirect stdin to the file and fork the decompression process +- reading from stdin. This allows shell metacharacters in filenames. */ - char *command = concat (*compression_program, " -d", ""); - -+ { if (fclose (f) < 0) return 0; - f = freopen (*opened_filename, FOPEN_RBIN, stdin); - if (!f) - return 0; - f = popen (command, "r"); +- if (!f) +- { ++ + if (**compression_program == 'g' || **compression_program == 'z') + f = fzopen (*opened_filename, "rg"); + if (**compression_program == 'b') @@ -50,28 +36,24 @@ Index: texinfo-6.6/install-info/Makefile.in + f = fzopen (*opened_filename, "rl"); + if (**compression_program == 'x') + f = fzopen (*opened_filename, "rx"); - if (!f) -- { -- /* Used for error message in calling code. */ -- *opened_filename = command; -- return 0; -+ { /* It's compressed, so open a pipe. */ -+ char *command = concat (*compression_program, " -d", ""); -+ -+ f = freopen (*opened_filename, FOPEN_RBIN, stdin); -+ if (!f) -+ return 0; -+ f = popen (command, "r"); -+ if (!f) -+ { -+ /* Used for error message in calling code. */ -+ *opened_filename = command; -+ return 0; -+ } ++ if (!f) { ++ /* Redirect stdin to the file and fork the decompression process ++ reading from stdin. This allows shell metacharacters in filenames. */ ++ char *command = concat (*compression_program, " -d", ""); ++ f = freopen (*opened_filename, FOPEN_RBIN, stdin); ++ if (!f) ++ return 0; ++ f = popen (command, "r"); ++ if (!f) { + /* Used for error message in calling code. */ + *opened_filename = command; + return 0; } ++ } } else -@@ -958,8 +972,22 @@ output_dirfile (char *dirfile, int dir_n + { +@@ -957,8 +969,22 @@ if (compression_program) { @@ -79,20 +61,32 @@ Index: texinfo-6.6/install-info/Makefile.in - output = popen (command, "w"); + output = NULL; + if (*compression_program == 'g' || *compression_program == 'z') -+ output = fzopen (dirfile, "wg"); ++ output = fzopen (dirfile, "wg"); + if (*compression_program == 'b') -+ output = fzopen (dirfile, "wb"); ++ output = fzopen (dirfile, "wb"); + if (*compression_program == 'Z') -+ output = fzopen (dirfile, "wZ"); ++ output = fzopen (dirfile, "wZ"); + if (*compression_program == 'l') -+ output = fzopen (dirfile, "wl"); ++ output = fzopen (dirfile, "wl"); + if (*compression_program == 'x') -+ output = fzopen (dirfile, "wx"); ++ output = fzopen (dirfile, "wx"); + if (!output) -+ { -+ char *command = concat (compression_program, ">", dirfile); -+ output = popen (command, "w"); -+ } ++ { ++ char *command = concat (compression_program, ">", dirfile); ++ output = popen (command, "w"); ++ } } else output = fopen (dirfile, "w"); +diff -Nur texinfo-6.8/install-info/Makefile.in new/install-info/Makefile.in +--- texinfo-6.8/install-info/Makefile.in 2021-07-03 11:13:01.000000000 +0200 ++++ new/install-info/Makefile.in 2022-04-25 12:30:06.593744741 +0200 +@@ -239,7 +239,7 @@ + PROGRAMS = $(bin_PROGRAMS) + am_ginstall_info_OBJECTS = install-info.$(OBJEXT) + ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) +-ginstall_info_LDADD = $(LDADD) ++ginstall_info_LDADD = $(LDADD) -lzio + am__DEPENDENCIES_1 = + ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) diff --git a/texinfo.changes b/texinfo.changes index 34e8342..4fc6afc 100644 --- a/texinfo.changes +++ b/texinfo.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Tue Apr 26 13:37:31 UTC 2022 - Ferdinand Thiessen + +- Add 13a8894fe2.patch + * Fixing @headings: Add missing option value 'single'. + Resolved regression where gpm could not be build. + +------------------------------------------------------------------- +Mon Apr 25 10:39:55 UTC 2022 - Ferdinand Thiessen + +- Update to version 6.8 + * new command @displaymath for formatting of mathematical notation + * new command @example takes an argument to specify the language + * Deprecate commands: @centerchap, @definfoenclose, @refill, @inforef + * new paper size @bsixpaper + * texi2any + * should be faster as Perl XS parser is enabled by default + * SHOW_MENU customization variable replaced by FORMAT_MENU. + * only check menu structure if CHECK_NORMAL_MENU_STRUCTURE + variable is set + * MathJax support for display of math. + * JavaScript License Web Labels support + * Use sectional tables of contents instead of menus by defaut + * Use section names in links by default + * CONTENTS_OUTPUT_LOCATION sets location of table of contents + * Document sections wrapped in
elements + * New variable USE_NODE_DIRECTIONS to use node or section structure + for node directions + * copiable anchor links for definitions + * Don't add an extra period before file extension given as + an argument to @image if image file is not found + * info: Support compressed dir files + * texi2dvi: Stop on first error in input file + * texinfo.tex: + * put logical page numbers into PDF's ('page labels') + * put chapter numbers in the PDF outline + * new Finnish translation +- Rebased texinfo-zlib.patch + ------------------------------------------------------------------- Mon Feb 21 07:44:17 UTC 2022 - Dr. Werner Fink diff --git a/texinfo.spec b/texinfo.spec index 8f88fa1..f34a9c9 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -19,7 +19,7 @@ # perl modules are not installed in global path %global __provides_exclude ^(libtool|perl)\\( Name: texinfo -Version: 6.7 +Version: 6.8 Release: 0 Summary: Tools for creating documentation from texinfo sources License: GPL-3.0-or-later @@ -28,8 +28,10 @@ Source0: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz Source1: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz.sig Source2: %{name}.keyring Source42: %{name}-rpmlintrc -Patch1: texinfo-zlib.patch -Patch2: install-info_exitcode.patch +Patch0: texinfo-zlib.patch +Patch1: install-info_exitcode.patch +# PATCH-FIX-UPSTREAM 13a8894fe2.patch -- https://git.savannah.gnu.org/cgit/texinfo.git/diff/?id=13a8894fe2 +Patch2: 13a8894fe2.patch BuildRequires: automake BuildRequires: glibc-locale BuildRequires: help2man @@ -106,8 +108,7 @@ or standalone GNU Info. %prep %setup -q -%patch1 -p1 -b .zio -%patch2 -p1 +%autopatch -p1 %build LANG=en_GB.UTF-8 @@ -115,7 +116,7 @@ export LANG %configure \ --with-external-Text-Unidecode \ --enable-perl-xs -make %{?_smp_mflags} +%make_build %install %make_install