Update to texinfo-6.5

.gitignore

@@ -1,2 +1,4 @@
 /texinfo-6.4.tar.xz
 /texinfo-6.4.tar.xz.sig
+/texinfo-6.5.tar.xz
+/texinfo-6.5.tar.xz.sig

sources

@@ -1,2 +1,2 @@
-SHA512 (texinfo-6.4.tar.xz) = 628e7fb64c4cb6d4ec879d5593e3660dbbbf41915c7aec68b6af209a1c496bee8a3879a69e4e047c3bee0cb476540ffd6ebdef5ec7b712edd191a82ce9ac4006
+SHA512 (texinfo-6.5.tar.xz) = 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc
-SHA512 (texinfo-6.4.tar.xz.sig) = a36c9b6258bb6ac291f0d1c21ac7a7851d9c33aceabb15e6fe52c0d537084cedb565aa458c9ea46116ab53af6eca753b1512edcf046ab7c37ca3c77fccb879fc
+SHA512 (texinfo-6.5.tar.xz.sig) = d1b3e0bdaf80316410bb10edd25edfbf83afd6ac9a34881487722a9aafeab381272c946acd649b745f1bd9a55f279d05ac638ef610c09f4347f5e3e893b47c4f

texinfo-6.0-disable-failing-info-test.patch

@@ -1,7 +1,7 @@
-diff -up texinfo-6.4/info/Makefile.in.orig texinfo-6.4/info/Makefile.in
+diff -up texinfo-6.4.90/info/Makefile.in.orig texinfo-6.4.90/info/Makefile.in
---- texinfo-6.4/info/Makefile.in.orig	2017-06-23 08:04:39.000000000 +0200
+--- texinfo-6.4.90/info/Makefile.in.orig	2017-07-10 21:06:01.000000000 +0200
-+++ texinfo-6.4/info/Makefile.in	2017-06-27 14:44:50.270650688 +0200
++++ texinfo-6.4.90/info/Makefile.in	2017-07-11 09:58:06.501153160 +0200
-@@ -1364,7 +1364,6 @@ TESTS = \
+@@ -1367,7 +1367,6 @@ TESTS = \
  	t/end-of-line.sh \
  	t/goal-column.sh \
  	t/star-note-non-whitespace.sh \
@@ -9,7 +9,7 @@ diff -up texinfo-6.4/info/Makefile.in.orig texinfo-6.4/info/Makefile.in
  	t/last-no-history.sh \
  	t/split-footnotes.sh \
  	t/window-split-dir.sh \
-@@ -1389,10 +1388,6 @@ TESTS = \
+@@ -1392,10 +1391,6 @@ TESTS = \
  	t/search-skip-screen.sh \
  	t/search-empty.sh \
  	t/close-window-after-search.sh \
@@ -17,13 +17,13 @@ diff -up texinfo-6.4/info/Makefile.in.orig texinfo-6.4/info/Makefile.in
 -	t/inc-sea-forward-nonregex.sh \
 -	t/inc-sea-insensitive.sh \
 -	t/inc-sea-history.sh \
+ 	t/inc-sea-bs.sh \
  	t/gc-split.sh \
  	t/anchor-positions.sh \
- 	t/quoted-label-as-target.sh \
+diff -up texinfo-6.4.90/tp/tests/Makefile.in.orig texinfo-6.4.90/tp/tests/Makefile.in
-diff -up texinfo-6.4/tp/tests/Makefile.in.orig texinfo-6.4/tp/tests/Makefile.in
+--- texinfo-6.4.90/tp/tests/Makefile.in.orig	2017-07-10 20:52:24.000000000 +0200
---- texinfo-6.4/tp/tests/Makefile.in.orig	2017-06-23 08:04:41.000000000 +0200
++++ texinfo-6.4.90/tp/tests/Makefile.in	2017-07-11 09:59:30.838233561 +0200
-+++ texinfo-6.4/tp/tests/Makefile.in	2017-06-27 14:58:23.872202271 +0200
+@@ -1308,7 +1308,6 @@ one_test_files_generated_list = \
-@@ -1307,7 +1307,6 @@ one_test_files_generated_list = \
       test_scripts/formatting_simplest_test_prefix_info.sh \
       test_scripts/formatting_simplest_test_css.sh \
       test_scripts/formatting_simplest_test_date_in_header.sh \
@@ -31,7 +31,7 @@ diff -up texinfo-6.4/tp/tests/Makefile.in.orig texinfo-6.4/tp/tests/Makefile.in
       test_scripts/formatting_documentlanguage_set_unknown.sh \
       test_scripts/formatting_documentlanguage_set_option_info.sh \
       test_scripts/formatting_float_copying.sh \
-@@ -1347,7 +1346,6 @@ one_test_files_generated_list = \
+@@ -1348,7 +1347,6 @@ one_test_files_generated_list = \
       test_scripts/sectioning_top_node_up_explicit.sh \
       test_scripts/coverage_texi_formatting.sh \
       test_scripts/coverage_formatting.sh \
@@ -39,7 +39,7 @@ diff -up texinfo-6.4/tp/tests/Makefile.in.orig texinfo-6.4/tp/tests/Makefile.in
       test_scripts/indices_double_index_entry.sh \
       test_scripts/indices_split_chapter_index.sh \
       test_scripts/indices_index_split.sh \
-@@ -1446,7 +1444,6 @@ one_test_files_generated_list = \
+@@ -1447,7 +1445,6 @@ one_test_files_generated_list = \
       test_scripts/layout_formatting_html32.sh \
       test_scripts/layout_formatting_regions.sh \
       test_scripts/layout_formatting_exotic.sh \

texinfo-6.4-info-fix-following-more-than-one-line-cross-reference.patch

@@ -1,11 +0,0 @@
-diff -up texinfo-6.4/info/info-utils.c.orig texinfo-6.4/info/info-utils.c
---- texinfo-6.4/info/info-utils.c.orig	2017-07-10 10:37:50.713333292 +0200
-+++ texinfo-6.4/info/info-utils.c	2017-07-10 10:38:16.342348756 +0200
-@@ -1280,6 +1280,7 @@ scan_reference_label (REFERENCE *entry,
-                                 &entry->nodename);
-       if (!len)
-         return 0; /* Input invalid. */
-+      canonicalize_whitespace (entry->nodename);
-       label_len += len;
-     }
-   else

texinfo-6.4-info-fix-possible-incorrect-selection-of-already-loaded-file.patch

@@ -1,22 +0,0 @@
-diff -up texinfo-6.4/info/nodes.c.orig texinfo-6.4/info/nodes.c
---- texinfo-6.4/info/nodes.c.orig	2017-06-18 14:50:42.000000000 +0200
-+++ texinfo-6.4/info/nodes.c	2017-07-10 09:39:10.195209219 +0200
-@@ -678,6 +678,7 @@ info_find_subfile (char *fullpath)
-   char *with_extension = 0;
-   int i;
-   FILE_BUFFER *file_buffer = 0;
-+  int fullpath_len = strlen (fullpath);
- 
-   /* First try to find the file in our list of already loaded files. */
-   if (info_loaded_files)
-@@ -685,7 +686,9 @@ info_find_subfile (char *fullpath)
-       for (i = 0; (file_buffer = info_loaded_files[i]); i++)
-         /* Check if fullpath starts the name of the recorded file (extra
-            extensions like ".info.gz" could be added.) */
--        if (!strncmp (file_buffer->fullpath, fullpath, strlen (fullpath)))
-+        if (!strncmp (file_buffer->fullpath, fullpath, fullpath_len)
-+            && (file_buffer->fullpath[fullpath_len] == '\0'
-+                || file_buffer->fullpath[fullpath_len] == '.'))
-           {
-             struct stat new_info, *old_info;
- 

texinfo.spec

@@ -2,8 +2,8 @@
 
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
-Version: 6.4
+Version: 6.5
-Release: 5%{?dist}
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -17,9 +17,6 @@ Patch0: texinfo-4.12-zlib.patch
 Patch1: texinfo-6.0-disable-failing-info-test.patch
 # Patch2: rhbz#1348671, because of OSTree
 Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
-# Patches 3-4 are already upstream
-Patch3: texinfo-6.4-info-fix-following-more-than-one-line-cross-reference.patch
-Patch4: texinfo-6.4-info-fix-possible-incorrect-selection-of-already-loaded-file.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: perl-interpreter >= 5.7.3, perl(Text::Unidecode)
@@ -72,8 +69,6 @@ for printing using TeX.
 %patch0 -p1 -b .zlib
 %patch1 -p1 -b .disable-failing-info-test
 %patch2 -p1 -b .install-info-use-create-tmp-then-rename-pattern
-%patch3 -p1 -b .info-fix-following-more-than-one-line-cross-reference
-%patch4 -p1 -b .info-fix-possible-incorrect-selection-of-already-loaded-file
 
 %build
 %configure --with-external-Text-Unidecode \
@@ -176,6 +171,10 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Wed Sep 13 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-1
+- Update to texinfo-6.5
+  Resolves: #1491075
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild