Update to version 7.0.3

info-6.5-sync-fix-info-dir.patch

@@ -1,40 +0,0 @@
-diff -uNr texinfo-6.5.orig/contrib/fix-info-dir texinfo-6.5/contrib/fix-info-dir
---- texinfo-6.5.orig/contrib/fix-info-dir	2014-04-22 03:56:56.000000000 +0200
-+++ texinfo-6.5/contrib/fix-info-dir	2018-02-04 13:48:35.979359350 +0100
-@@ -163,29 +163,23 @@
- {
- 
- 	### output the dir header
--	echo "-*- Text -*-"
--	echo "This file was generated automatically by $0."
--	echo "This version was generated on `date`"
--	echo "by `whoami`@`hostname` for `pwd`"
- 
- 	cat<<DIR_FILE_END_OF_FILE
--This is the file .../info/$DIR_FILE, which contains the topmost node of the
--Info hierarchy.  The first time you invoke Info you start off
--looking at that node, which is ($DIR_FILE)Top.
--
-+This is the file .../info/$DIR_FILE, which contains the
-+topmost node of the Info hierarchy, called ($DIR_FILE)Top.
-+The first time you invoke Info you start off looking at this node.
- 
--File: $DIR_FILE       Node: Top       This is the top of the INFO tree
-+File: $DIR_FILE,	Node: Top	This is the top of the INFO tree
- 
-   This (the Directory node) gives a menu of major topics.
--  Typing "q" exits, "?" lists all Info commands, "d" returns here,
-+  Typing "q" exits, "H" lists all Info commands, "d" returns here,
-   "h" gives a primer for first-timers,
--  "mEmacs<Return>" visits the Emacs topic, etc.
-+  "mEmacs<Return>" visits the Emacs manual, etc.
- 
-   In Emacs, you can click mouse button 2 on a menu item or cross reference
-   to select it.
- 
--* Menu: The list of major topics begins on the next line.
--
-+* Menu:
- DIR_FILE_END_OF_FILE
- 
- ### go through the list of files in the skeleton.  If an info file

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

@@ -1,25 +0,0 @@
-diff -up texinfo-6.5.92/install-info/tests/Makefile.in.orig texinfo-6.5.92/install-info/tests/Makefile.in
---- texinfo-6.5.92/install-info/tests/Makefile.in.orig	2019-02-01 16:16:49.000000000 +0100
-+++ texinfo-6.5.92/install-info/tests/Makefile.in	2019-02-18 10:33:52.078877104 +0100
-@@ -1229,8 +1229,8 @@ ii-0021-test ii-0022-test ii-0023-test i
- ii-0026-test ii-0027-test ii-0028-test ii-0029-test ii-0030-test \
- ii-0031-test ii-0032-test ii-0033-test ii-0034-test ii-0035-test \
- ii-0036-test ii-0037-test ii-0038-test ii-0039-test ii-0040-test \
--ii-0041-test ii-0042-test ii-0043-test ii-0044-test ii-0045-test \
--ii-0046-test ii-0047-test ii-0048-test ii-0049-test ii-0050-test \
-+ii-0042-test ii-0043-test ii-0044-test ii-0045-test \
-+ii-0046-test ii-0047-test ii-0048-test ii-0049-test \
- ii-0051-test ii-0052-test ii-0053-test ii-0054-test ii-0055-test \
- ii-0056-test ii-0057-test
- 
-diff -up texinfo-6.5.92/tp/tests/Makefile.in.orig texinfo-6.5.92/tp/tests/Makefile.in
---- texinfo-6.5.92/tp/tests/Makefile.in.orig	2019-02-01 16:16:50.000000000 +0100
-+++ texinfo-6.5.92/tp/tests/Makefile.in	2019-02-18 10:33:13.774827269 +0100
-@@ -1374,7 +1374,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/layout_formatting.sh \

texinfo-6.5-fix-info-dir.patch

@@ -1,41 +0,0 @@
-This fixes two issues:
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1592433
-This is a bug in fix-info-dir --delete
-(Hunk 3)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1614162
-This is a weird infinite loop that happens when fix-info-dir is run with stderr
-redirected to /dev/null while /dev/null doesn't exist (or isn't a device)
-(Hunks 1 and 2)
-
-diff --git a/contrib/fix-info-dir b/contrib/fix-info-dir
-index 4439ada..9240060 100755
---- a/contrib/fix-info-dir
-+++ b/contrib/fix-info-dir
-@@ -124,6 +124,7 @@ if test "$CREATE_NODE"; then
- 		fi
- 		shift
- 	else
-+		SKIP_READ=yes
- 		SKELETON=/dev/null
- 
- 	fi
-@@ -188,7 +189,7 @@ DIR_FILE_END_OF_FILE
- 
- 	# Read one line from the file.  This is so that we can echo lines with
- 	# whitespace and quoted characters in them.
--	while read fileline; do
-+	while test -z "$SKIP_READ" && read fileline; do
- 		# flag fancy features
- 		if test ! -z "$echoline"; then        # echo line
- 			echo "$fileline"
-@@ -294,7 +295,7 @@ else
- 	DONE_MSG="total invalid menu item(s) were removed from `pwd`/$DIR_FILE"
- 	for Info_Name in `comm -23 $TMP_FILE1 $TMP_FILE2`; do
- 		Changed="y"
--		if install-info --remove $Info_Name $DIR_FILE; then
-+		if install-info --remove --remove-exactly $Info_Name $DIR_FILE; then
- 			Total=`expr "$Total" + "1"`
- 		fi
- 	done

texinfo-6.8-undo-gnulib-nonnul.patch

@@ -1,182 +0,0 @@
-diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h
---- texinfo-6.8/gnulib/lib/cdefs.h.orig	2021-03-11 19:57:53.000000000 +0100
-+++ texinfo-6.8/gnulib/lib/cdefs.h	2021-07-19 12:26:46.985176475 +0200
-@@ -321,15 +321,15 @@
- 
- /* The nonnull function attribute marks pointer parameters that
-    must not be NULL.  */
--#ifndef __attribute_nonnull__
-+#ifndef __nonnull
- # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__)
--#  define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params))
-+#  define __nonnull(params) __attribute__ ((__nonnull__ params))
- # else
--#  define __attribute_nonnull__(params)
-+#  define __nonnull(params)
- # endif
--#endif
--#ifndef __nonnull
--# define __nonnull(params) __attribute_nonnull__ (params)
-+#elif !defined __GLIBC__
-+# undef __nonnull
-+# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params)
- #endif
- 
- /* If fortification mode, we warn about unused results of certain
-diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h
---- texinfo-6.8/gnulib/lib/libc-config.h.orig	2021-03-11 19:57:54.000000000 +0100
-+++ texinfo-6.8/gnulib/lib/libc-config.h	2021-07-19 12:27:58.810590975 +0200
-@@ -33,9 +33,9 @@
- #include <config.h>
- 
- /* On glibc this includes <features.h> and <sys/cdefs.h> and #defines
--   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 and
--   DragonFlyBSD 5.9 it includes <sys/cdefs.h> which defines __nonnull.
--   Elsewhere it is harmless.  */
-+   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 it
-+   includes <sys/cdefs.h> which defines __nonnull.  Elsewhere it
-+   is harmless.  */
- #include <errno.h>
- 
- /* From glibc <errno.h>.  */
-diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c
---- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig	2021-03-11 19:57:54.000000000 +0100
-+++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c	2021-07-19 12:24:46.878419397 +0200
-@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY
- 
- /* Initialize a dynamic array object.  This must be called before any
-    use of the object.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static void
- DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list)
- {
-@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST
- }
- 
- /* Deallocate the dynamic array and its elements.  */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static void
- DYNARRAY_FREE (struct DYNARRAY_STRUCT *list)
- {
-@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l
- }
- 
- /* Return true if the dynamic array is in an error state.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline bool
- DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list)
- {
-@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct
- 
- /* Mark the dynamic array as failed.  All elements are deallocated as
-    a side effect.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static void
- DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list)
- {
-@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA
- 
- /* Return the number of elements which have been added to the dynamic
-    array.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline size_t
- DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list)
- {
-@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR
- 
- /* Return a pointer to the array element at INDEX.  Terminate the
-    process if INDEX is out of bounds.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline DYNARRAY_ELEMENT *
- DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index)
- {
-@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU
- /* Return a pointer to the first array element, if any.  For a
-    zero-length array, the pointer can be NULL even though the dynamic
-    array has not entered the failure state.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline DYNARRAY_ELEMENT *
- DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list)
- {
-@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S
- /* Return a pointer one element past the last array element.  For a
-    zero-length array, the pointer can be NULL even though the dynamic
-    array has not entered the failure state.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline DYNARRAY_ELEMENT *
- DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list)
- {
-@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S
- /* Add ITEM at the end of the array, enlarging it by one element.
-    Mark *LIST as failed if the dynamic array allocation size cannot be
-    increased.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline void
- DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item)
- {
-@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR
- /* Allocate a place for a new element in *LIST and return a pointer to
-    it.  The pointer can be NULL if the dynamic array cannot be
-    enlarged due to a memory allocation failure.  */
--__attribute_maybe_unused__ __attribute_warn_unused_result__
--__attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
- static
- /* Avoid inlining with the larger initialization code.  */
- #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE))
-@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY
-    existing size, new elements are added (which can be initialized).
-    Otherwise, the list is truncated, and elements are freed.  Return
-    false on memory allocation failure (and mark *LIST as failed).  */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static bool
- DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size)
- {
-@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_
- }
- 
- /* Remove the last element of LIST if it is present.  */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static void
- DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list)
- {
-@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA
- 
- /* Remove all elements from the list.  The elements are freed, but the
-    list itself is not.  */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static void
- DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list)
- {
-@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S
-    stored in *RESULT if LIST refers to an empty list.  On success, the
-    pointer in *RESULT is heap-allocated and must be deallocated using
-    free.  */
--__attribute_maybe_unused__ __attribute_warn_unused_result__
--__attribute_nonnull__ ((1, 2))
-+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2))
- static bool
- DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list,
-                           DYNARRAY_FINAL_TYPE *result)
-@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA
-    have a sentinel at the end).  If LENGTHP is not NULL, the array
-    length is written to *LENGTHP.  *LIST is re-initialized and can be
-    reused.  */
--__attribute_maybe_unused__ __attribute_warn_unused_result__
--__attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
- static DYNARRAY_ELEMENT *
- DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp)
- {

texinfo-6.8.tar.xz.sig

@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCYOBI7hkcZ2F2aW5zbWl0
-aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upvZEA/R2uZA180mjPpl2kesisoFr7
-FgWLsI5pBkoW9zkQgHLFAP4+A356Y3n3KGzrJaekeDZaeyn+BxXxVWrzNEIP6Tvq
-WA==
-=xAUQ
------END PGP SIGNATURE-----

texinfo-7.0.3.tar.xz.sig

@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+
+iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCZCA15BkcZ2F2aW5zbWl0
+aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upzwABAI2fLUksBxG7Zs/MXc6nTzFV
+vM/ujEry9Xc+dXwpD1H7AP99udrll7XijKAMJG0G2/w2RVPu56x5l6UGrLhJB8Wt
+PQ==
+=A5eq
+-----END PGP SIGNATURE-----

texinfo.spec

@@ -3,20 +3,16 @@
 %global __requires_exclude ^perl\\(.*Texinfo.*\\)$
 
 Name: texinfo
-Version: 6.8
+Version: 7.0.3
-Release: 5
+Release: 1
 Summary: The GNU Documentation System
 License: GPLv3+
 Url: http://www.gnu.org/software/texinfo/
 Source0: https://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
 Source1: https://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz.sig
 
-Patch0001: texinfo-6.0-disable-failing-info-test.patch
 Patch0002: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
-Patch0003: info-6.5-sync-fix-info-dir.patch
-Patch0004: texinfo-6.5-fix-info-dir.patch
 Patch0005: texinfo-6.5-covscan-fixes.patch
-Patch0006: texinfo-6.8-undo-gnulib-nonnul.patch
 
 BuildRequires: gcc perl-generators zlib-devel ncurses-devel help2man
 BuildRequires: perl(Data::Dumper) perl(Locale::Messages) perl(Unicode::EastAsianWidth) perl(Text::Unidecode) perl(Storable) perl(Unicode::Normalize)
@@ -75,7 +71,6 @@ install -p -m644 doc/texinfo.tex doc/txi-??.tex $RPM_BUILD_ROOT%{tex_texinfo}
 
 mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin
 
-install -Dpm0755 -t %{buildroot}%{_sbindir} contrib/fix-info-dir
 
 %find_lang %{name}
 %find_lang %{name}_document
@@ -115,10 +110,11 @@ export ALL_TESTS=yes
 %files -n info
 %license COPYING
 %{_bindir}/info
-%{_sbindir}/fix-info-dir
 /sbin/install-info
 %ghost %{_infodir}/dir
 %ghost %{_infodir}/dir.old
+%{_infodir}/texi2any_api.info.gz
+%{_infodir}/texi2any_internals.info.gz
 
 %files help
 %license COPYING
@@ -137,6 +133,9 @@ export ALL_TESTS=yes
 %{_mandir}/man5/texinfo.5*
 
 %changelog
+* Fri Jul 21 2023 zhangchenglin <zhanchenglin@kylinos.cn> -  7.0.3-1
+- update to 7.0.3
+
 * Mon Feb 13 2023 zhouwenpei <zhouwenpei1@h-partners.com> -  6.8-5
 - revent "update to 7.0.2"