diff --git a/install-info_exitcode.patch b/install-info_exitcode.patch index 57859d5..de57e2d 100644 --- a/install-info_exitcode.patch +++ b/install-info_exitcode.patch @@ -26,11 +26,11 @@ is affecting upgrade process. https://bugzilla.suse.com/show_bug.cgi?id=1084997 -Index: texinfo-6.5/install-info/install-info.c +Index: texinfo-6.6/install-info/install-info.c =================================================================== ---- texinfo-6.5.orig/install-info/install-info.c -+++ texinfo-6.5/install-info/install-info.c -@@ -249,7 +249,7 @@ fatal (const char *fmt, ...) +--- texinfo-6.6.orig/install-info/install-info.c ++++ texinfo-6.6/install-info/install-info.c +@@ -246,7 +246,7 @@ fatal (const char *fmt, ...) va_start (ap, fmt); vdiag (fmt, NULL, ap); va_end (ap); diff --git a/perl-5.28-fixes.patch b/perl-5.28-fixes.patch deleted file mode 100644 index 9729b0e..0000000 --- a/perl-5.28-fixes.patch +++ /dev/null @@ -1,56 +0,0 @@ ->From 1f27900352e04ff4f19bec1c1e9635adad2be31c Mon Sep 17 00:00:00 2001 -From: Niko Tyni -Date: Fri, 18 May 2018 10:40:00 +0100 -Subject: [PATCH] Fix unescaped left braces in regexps, deprecated since Perl - 5.27.8 - -This fixes test failures on recent Perl versions. ---- - tp/Texinfo/Parser.pm | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: texinfo-6.5/tp/Texinfo/Parser.pm -=================================================================== ---- texinfo-6.5.orig/tp/Texinfo/Parser.pm -+++ texinfo-6.5/tp/Texinfo/Parser.pm -@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) - } - } elsif ($command eq 'clickstyle') { - # REMACRO -- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { -+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) { - $args = ['@'.$1]; - $self->{'clickstyle'} = $1; - $remaining = $line; -- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; -+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//; - $has_comment = 1 if (defined($4)); - } else { - $self->line_error (sprintf($self->__( -Index: texinfo-6.5/tp/Texinfo/Convert/XSParagraph/xspara.c -=================================================================== ---- texinfo-6.5.orig/tp/Texinfo/Convert/XSParagraph/xspara.c -+++ texinfo-6.5/tp/Texinfo/Convert/XSParagraph/xspara.c -@@ -248,6 +248,11 @@ xspara_init (void) - - dTHX; - -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ switch_to_global_locale(); -+#endif -+ - if (setlocale (LC_CTYPE, "en_US.UTF-8") - || setlocale (LC_CTYPE, "en_US.utf8")) - goto success; -@@ -320,6 +325,10 @@ failure: - { - success: ; - free (utf8_locale); -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ sync_locale(); -+#endif - /* - fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n"); - fprintf (stderr, "character encoding is: %s\n", diff --git a/texinfo-6.5.tar.xz b/texinfo-6.5.tar.xz deleted file mode 100644 index bbad8c1..0000000 --- a/texinfo-6.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77774b3f4a06c20705cc2ef1c804864422e3cf95235e965b1f00a46df7da5f62 -size 4503048 diff --git a/texinfo-6.5.tar.xz.sig b/texinfo-6.5.tar.xz.sig deleted file mode 100644 index c09a4d8..0000000 --- a/texinfo-6.5.tar.xz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iF4EABEIAAYFAlm4QBsACgkQ3bxXnas3+6mlNwD/Tzn0IxHxWCII18A72dLZ0rDB -0GtvrWV4c/wtYHSGSNEA/3iIAv2qbGreDAXAzLHKsWm5vKzFvRPeDS7GBJQg018q -=EUkI ------END PGP SIGNATURE----- diff --git a/texinfo-6.6.tar.xz b/texinfo-6.6.tar.xz new file mode 100644 index 0000000..d905ac9 --- /dev/null +++ b/texinfo-6.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bb9ca00da53f26a7e5725eee49689cd4a1e18d25d5b061ac8b2053018d93d66 +size 4946900 diff --git a/texinfo-6.6.tar.xz.sig b/texinfo-6.6.tar.xz.sig new file mode 100644 index 0000000..e395d67 --- /dev/null +++ b/texinfo-6.6.tar.xz.sig @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iF4EABEIAAYFAlxoUV0ACgkQ3bxXnas3+6k8XgEArq1U1cY6HMgVoEl32OLCgJai +1988Ep5IUTNk9RaTaxcBAJt5Sax7on7Xb4WmbeYWfxnL+DZMGvd6cw+jeKUL07K+ +=Ge1E +-----END PGP SIGNATURE----- diff --git a/texinfo-zlib.patch b/texinfo-zlib.patch index 2e4ddac..f2740d1 100644 --- a/texinfo-zlib.patch +++ b/texinfo-zlib.patch @@ -1,8 +1,13 @@ -Index: texinfo-6.5/install-info/Makefile.in +Index: texinfo-6.6/install-info/Makefile.in =================================================================== ---- texinfo-6.5.orig/install-info/Makefile.in -+++ texinfo-6.5/install-info/Makefile.in -@@ -222,7 +222,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" +--- + texinfo-6.6/install-info/Makefile.in | 2 - + texinfo-6.6/install-info/install-info.c | 56 +++++++++++++++++++++++++++----- + 2 files changed, 49 insertions(+), 9 deletions(-) + +--- texinfo-6.6/install-info/Makefile.in ++++ texinfo-6.6/install-info/Makefile.in 2019-08-27 13:50:21.423140298 +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) @@ -10,12 +15,10 @@ Index: texinfo-6.5/install-info/Makefile.in +ginstall_info_LDADD = $(LDADD) -lzio am__DEPENDENCIES_1 = ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) -Index: texinfo-6.5/install-info/install-info.c -=================================================================== ---- texinfo-6.5.orig/install-info/install-info.c -+++ texinfo-6.5/install-info/install-info.c -@@ -22,6 +22,7 @@ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +--- texinfo-6.6/install-info/install-info.c ++++ texinfo-6.6/install-info/install-info.c 2019-08-27 13:51:57.493361483 +0000 +@@ -19,6 +19,7 @@ #include #include #include @@ -23,7 +26,7 @@ Index: texinfo-6.5/install-info/install-info.c #define TAB_WIDTH 8 -@@ -701,34 +702,59 @@ open_possibly_compressed_file (char *fil +@@ -698,34 +699,59 @@ open_possibly_compressed_file (char *fil *opened_filename = filename; f = fopen (*opened_filename, FOPEN_RBIN); @@ -36,13 +39,13 @@ Index: texinfo-6.5/install-info/install-info.c + if (nread == 1) + { + if (data[0] == '\x1f' && data[1] == '\x8b') -+ *compression_program = "g"; ++ *compression_program = "gzip"; + else if (data[0] == '\x1f' && data[1] == '\x9d') -+ *compression_program = "Z"; ++ *compression_program = "gzip"; + else if (data[0] == '\x1f' && data[1] == '\x9e') -+ *compression_program = "z"; ++ *compression_program = "gzip"; + else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h') -+ *compression_program = "b"; ++ *compression_program = "bzip2"; + } + fclose (f); + f = fzopen (*opened_filename, FOPEN_RBIN); @@ -52,7 +55,7 @@ Index: texinfo-6.5/install-info/install-info.c *opened_filename = concat (filename, ".gz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = fzopen (*opened_filename, FOPEN_RBIN); -+ *compression_program = "g"; ++ *compression_program = "gzip"; } if (!f) { @@ -60,7 +63,7 @@ Index: texinfo-6.5/install-info/install-info.c *opened_filename = concat (filename, ".xz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = fzopen (*opened_filename, FOPEN_RBIN); -+ *compression_program = "x"; ++ *compression_program = "xz"; } if (!f) { @@ -68,7 +71,7 @@ Index: texinfo-6.5/install-info/install-info.c *opened_filename = concat (filename, ".bz2", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = fzopen (*opened_filename, FOPEN_RBIN); -+ *compression_program = "b"; ++ *compression_program = "bzip2"; } if (!f) { @@ -76,7 +79,7 @@ Index: texinfo-6.5/install-info/install-info.c *opened_filename = concat (filename, ".lz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = fzopen (*opened_filename, FOPEN_RBIN); -+ *compression_program = "l"; ++ *compression_program = "lzma"; } if (!f) { @@ -84,11 +87,20 @@ Index: texinfo-6.5/install-info/install-info.c *opened_filename = concat (filename, ".lzma", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = fzopen (*opened_filename, FOPEN_RBIN); -+ *compression_program = "l"; ++ *compression_program = "lzma"; } #ifdef __MSDOS__ if (!f) -@@ -961,8 +987,22 @@ output_dirfile (char *dirfile, int dir_n +@@ -850,7 +876,7 @@ determine_file_type: + *compression_program = "lzma"; + #endif + +- else ++ else if (!*compression_program) + *compression_program = NULL; + + /* Seek back over the magic bytes. */ +@@ -958,8 +984,22 @@ output_dirfile (char *dirfile, int dir_n if (compression_program) { diff --git a/texinfo.changes b/texinfo.changes index 7a2196b..57f2a5f 100644 --- a/texinfo.changes +++ b/texinfo.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Wed Aug 28 08:24:13 UTC 2019 - Dr. Werner Fink + +- Move texindex.awk to package texinfo as texindex(1) is part of + and use this awk script + +------------------------------------------------------------------- +Tue Aug 27 13:52:33 UTC 2019 - Dr. Werner Fink + +- Port the texinfo-zlib.patch to new version 6.6 to solve build problems + +------------------------------------------------------------------- +Tue Aug 27 07:03:03 UTC 2019 - Martin Pluskal + +- Update to version 6.6: + * Language: + . new commands @&, @ampchar{} + . @cropmarks command removed + . @ctrl is no longer recognised (it was a way to insert literal + control characters in Info files, but deprecated since the + time of Texinfo version 2) + . \usebracesinindexestrue is no longer recommended for using braces in + index entries, and has been a no-op for some time + * texi2any + . extension modules fixed to work with the "thread-safe locales" of + Perl 5.28 and newer + . some code changed to stop warnings being given by newer versions of Perl + . for HTML output, use `id' to define link targets instead of the `name' + attribute on + . A native-code implementation of the Texinfo parser has been included + on an experimental basis, which makes texi2any a lot faster. Set the + `TEXINFO_XS_PARSER' environment variable to 1 to use. + . changes to HTML output: + . omit colon after node name in menus by default (use + `MENU_ENTRY_COLON' to add it back) + . no special CSS for commands like @smallexample + . new customization variable `SECTION_NAME_IN_TITLE' to use the + section name as the document + . use section names instead of node names in generated menus + . pass on flags set with -D to TeX + . useless static libraries are not installed + . the newline after an @insertcopying is not output + . warning given for @multitable prototypes not in braces + . @indent and @noindent are not allowed inside the arguments to + commands where they are not meaningful + . @quote-arg and @allow-recursion are not recognised (these two used + to be recognised by makeinfo in macro definitions but were never + implemented in texinfo.tex) + . `FIX_TEXINFO' removed as a customization variable + . do not recognise or warn about obsolete customization variables + * info + . debugging output with -x is not diverted to a separate infodebug file + * Development: + . switch from Subversion to git + - https://savannah.gnu.org/git/?group=texinfo + . automake 1.16 +- Drop no longer needed patch: + * perl-5.28-fixes.patch + ------------------------------------------------------------------- Tue Dec 11 11:49:21 UTC 2018 - Dominique Leuenberger <dimstar@opensuse.org> diff --git a/texinfo.spec b/texinfo.spec index 79e9401..a7bd256 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,7 +1,7 @@ # # spec file for package texinfo # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ # perl modules are not installed in global path %global __provides_exclude ^(libtool|perl)\\( Name: texinfo -Version: 6.5 +Version: 6.6 Release: 0 Summary: Tools for creating documentation from texinfo sources License: GPL-3.0-or-later @@ -31,7 +31,6 @@ Source2: %{name}.keyring Source10: info-dir Patch1: texinfo-zlib.patch Patch2: install-info_exitcode.patch -Patch3: perl-5.28-fixes.patch BuildRequires: automake BuildRequires: help2man BuildRequires: libbz2-devel @@ -92,9 +91,8 @@ or standalone GNU Info. %prep %setup -q -%patch1 -p1 +%patch1 -p1 -b .p1 %patch2 -p1 -%patch3 -p1 %build LANG=en_GB.UTF-8 @@ -145,6 +143,7 @@ make %{?_smp_mflags} check %install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info%{ext_info} %files -f %{name}_document.lang +%defattr(-,root,root,0755) %license COPYING %doc ABOUT-NLS AUTHORS NEWS README TODO %doc doc/texinfo.tex doc/txi-*.tex @@ -154,29 +153,33 @@ make %{?_smp_mflags} check %{_bindir}/texindex %{_bindir}/pdftexi2dvi %{_infodir}/texinfo*%{ext_info} -%{_mandir}/man1/pod2texi.1%{ext_man} -%{_mandir}/man1/texindex.1%{ext_man} -%{_mandir}/man1/texi2dvi.1%{ext_man} -%{_mandir}/man1/texi2pdf.1%{ext_man} -%{_mandir}/man1/pdftexi2dvi.1%{ext_man} -%{_mandir}/man5/texinfo.5%{ext_man} +%{_mandir}/man1/pod2texi.1%{?ext_man} +%{_mandir}/man1/texindex.1%{?ext_man} +%{_mandir}/man1/texi2dvi.1%{?ext_man} +%{_mandir}/man1/texi2pdf.1%{?ext_man} +%{_mandir}/man1/pdftexi2dvi.1%{?ext_man} +%{_mandir}/man5/texinfo.5%{?ext_man} +%attr(644,root,root) %{_datadir}/texinfo/texindex.awk %files -n makeinfo -f %{name}.lang +%defattr(-,root,root,0755) %{_bindir}/makeinfo %{_bindir}/texi2any -%{_mandir}/man1/makeinfo.1%{ext_man} -%{_mandir}/man1/texi2any.1%{ext_man} +%{_mandir}/man1/makeinfo.1%{?ext_man} +%{_mandir}/man1/texi2any.1%{?ext_man} %{_libdir}/texinfo +%exclude %{_datadir}/texinfo/texindex.awk %{_datadir}/texinfo/ %files -n info +%defattr(-,root,root,0755) %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir /sbin/install-info %{_bindir}/install-info %{_bindir}/info -%{_infodir}/info-stnd.info* -%{_mandir}/man1/info.1* -%{_mandir}/man1/install-info.1* -%{_mandir}/man5/info.5* +%{_infodir}/info-stnd.info%{?ext_info} +%{_mandir}/man1/info.1%{?ext_man} +%{_mandir}/man1/install-info.1%{?ext_man} +%{_mandir}/man5/info.5%{?ext_man} %changelog