diff --git a/.gitignore b/.gitignore index 3d7038f..2a54308 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/texinfo-6.3.tar.xz -/texinfo-6.3.tar.xz.sig +/texinfo-6.4.tar.xz +/texinfo-6.4.tar.xz.sig diff --git a/sources b/sources index 0ff358a..766aaf7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -32baefe5c7080dfb512a4eac5ce67b2a texinfo-6.3.tar.xz -aca1ba19ab06e46e07cb3db6cf7aa397 texinfo-6.3.tar.xz.sig +SHA512 (texinfo-6.4.tar.xz) = 628e7fb64c4cb6d4ec879d5593e3660dbbbf41915c7aec68b6af209a1c496bee8a3879a69e4e047c3bee0cb476540ffd6ebdef5ec7b712edd191a82ce9ac4006 +SHA512 (texinfo-6.4.tar.xz.sig) = a36c9b6258bb6ac291f0d1c21ac7a7851d9c33aceabb15e6fe52c0d537084cedb565aa458c9ea46116ab53af6eca753b1512edcf046ab7c37ca3c77fccb879fc diff --git a/texinfo-4.12-zlib.patch b/texinfo-4.12-zlib.patch index 84132dc..0fc5bb4 100644 --- a/texinfo-4.12-zlib.patch +++ b/texinfo-4.12-zlib.patch @@ -1,6 +1,6 @@ -diff -up texinfo-6.1/install-info/install-info.c.orig texinfo-6.1/install-info/install-info.c ---- texinfo-6.1/install-info/install-info.c.orig 2016-02-06 13:20:24.000000000 +0100 -+++ texinfo-6.1/install-info/install-info.c 2016-02-11 09:19:15.646258510 +0100 +diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/install-info.c +--- texinfo-6.4/install-info/install-info.c.orig 2016-03-04 18:52:26.000000000 +0100 ++++ texinfo-6.4/install-info/install-info.c 2017-06-27 15:14:20.167998983 +0200 @@ -22,6 +22,7 @@ #include #include @@ -222,10 +222,10 @@ diff -up texinfo-6.1/install-info/install-info.c.orig texinfo-6.1/install-info/i *sizep = filled; return data; -diff -up texinfo-6.1/install-info/Makefile.in.orig texinfo-6.1/install-info/Makefile.in ---- texinfo-6.1/install-info/Makefile.in.orig 2016-02-06 13:24:05.000000000 +0100 -+++ texinfo-6.1/install-info/Makefile.in 2016-02-11 09:17:14.660744184 +0100 -@@ -215,7 +215,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" +diff -up texinfo-6.4/install-info/Makefile.in.orig texinfo-6.4/install-info/Makefile.in +--- texinfo-6.4/install-info/Makefile.in.orig 2017-06-23 08:04:39.000000000 +0200 ++++ texinfo-6.4/install-info/Makefile.in 2017-06-27 15:14:20.167998983 +0200 +@@ -221,7 +221,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) diff --git a/texinfo-6.0-disable-failing-info-test.patch b/texinfo-6.0-disable-failing-info-test.patch index 4ed2727..a7caf7c 100644 --- a/texinfo-6.0-disable-failing-info-test.patch +++ b/texinfo-6.0-disable-failing-info-test.patch @@ -1,7 +1,7 @@ -diff -up texinfo-6.1/info/Makefile.in.orig texinfo-6.1/info/Makefile.in ---- texinfo-6.1/info/Makefile.in.orig 2016-02-06 13:24:05.000000000 +0100 -+++ texinfo-6.1/info/Makefile.in 2016-02-09 12:48:35.505942307 +0100 -@@ -1342,7 +1342,6 @@ TESTS = \ +diff -up texinfo-6.4/info/Makefile.in.orig texinfo-6.4/info/Makefile.in +--- texinfo-6.4/info/Makefile.in.orig 2017-06-23 08:04:39.000000000 +0200 ++++ texinfo-6.4/info/Makefile.in 2017-06-27 14:44:50.270650688 +0200 +@@ -1364,7 +1364,6 @@ TESTS = \ t/end-of-line.sh \ t/goal-column.sh \ t/star-note-non-whitespace.sh \ @@ -9,10 +9,10 @@ diff -up texinfo-6.1/info/Makefile.in.orig texinfo-6.1/info/Makefile.in t/last-no-history.sh \ t/split-footnotes.sh \ t/window-split-dir.sh \ -@@ -1365,10 +1364,6 @@ TESTS = \ - t/replace-viewed.sh \ +@@ -1389,10 +1388,6 @@ TESTS = \ t/search-skip-screen.sh \ t/search-empty.sh \ + t/close-window-after-search.sh \ - t/inc-sea-forward.sh \ - t/inc-sea-forward-nonregex.sh \ - t/inc-sea-insensitive.sh \ @@ -20,30 +20,30 @@ diff -up texinfo-6.1/info/Makefile.in.orig texinfo-6.1/info/Makefile.in t/gc-split.sh \ t/anchor-positions.sh \ t/quoted-label-as-target.sh \ -diff -up texinfo-6.1/tp/tests/Makefile.in.orig texinfo-6.1/tp/tests/Makefile.in ---- texinfo-6.1/tp/tests/Makefile.in.orig 2016-02-09 12:49:19.741103869 +0100 -+++ texinfo-6.1/tp/tests/Makefile.in 2016-02-09 12:50:34.780377935 +0100 -@@ -1286,7 +1286,6 @@ one_test_files_generated_list = \ +diff -up texinfo-6.4/tp/tests/Makefile.in.orig texinfo-6.4/tp/tests/Makefile.in +--- texinfo-6.4/tp/tests/Makefile.in.orig 2017-06-23 08:04:41.000000000 +0200 ++++ texinfo-6.4/tp/tests/Makefile.in 2017-06-27 14:58:23.872202271 +0200 +@@ -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 \ +- test_scripts/formatting_documentlanguage_set_option.sh \ + 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 = \ test_scripts/sectioning_top_node_up_explicit.sh \ test_scripts/coverage_texi_formatting.sh \ test_scripts/coverage_formatting.sh \ - test_scripts/coverage_formatting_fr.sh \ - test_scripts/coverage_formatting_cr.sh \ test_scripts/indices_double_index_entry.sh \ test_scripts/indices_split_chapter_index.sh \ -@@ -1391,7 +1390,6 @@ one_test_files_generated_list = \ + test_scripts/indices_index_split.sh \ +@@ -1446,7 +1444,6 @@ one_test_files_generated_list = \ test_scripts/layout_formatting_html32.sh \ test_scripts/layout_formatting_regions.sh \ test_scripts/layout_formatting_exotic.sh \ - test_scripts/layout_formatting_fr_icons.sh \ test_scripts/layout_formatting_chm.sh \ test_scripts/layout_formatting_nodes.sh \ - test_scripts/formatting_texi_glossary.sh \ -@@ -1421,7 +1419,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 \ -- test_scripts/formatting_documentlanguage_set_option.sh \ - test_scripts/formatting_documentlanguage_set_unknown.sh \ - test_scripts/formatting_documentlanguage_set_option_info.sh \ - test_scripts/formatting_float_copying.sh \ + test_scripts/tex_html_block_EOL_tex.sh \ diff --git a/texinfo.spec b/texinfo.spec index 30c7bdd..ab5d982 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,8 +2,8 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 6.3 -Release: 3%{?dist} +Version: 6.4 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ @@ -171,6 +171,10 @@ fi %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Tue Jun 27 2017 Vitezslav Crhonek - 6.4-1 +- Update to texinfo-6.4 + Resolves: #1464624 + * Mon Mar 13 2017 Vitezslav Crhonek - 6.3-3 - Fix path to install-info in macros.info Resolves: #1419246