Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/texinfo.git#ba3d5b7e455fe02166a9d5a238e6e9ae17a3c88d
This commit is contained in:
DistroBaker 2021-02-06 04:56:08 +00:00
parent 13ce657749
commit dd531bf238
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up texinfo-6.7/tp/tests/run_parser_all.sh.orig texinfo-6.7/tp/tests/run_parser_all.sh
--- texinfo-6.7/tp/tests/run_parser_all.sh.orig 2019-08-25 19:11:47.000000000 +0200
+++ texinfo-6.7/tp/tests/run_parser_all.sh 2021-02-02 14:36:15.290152957 +0100
@@ -46,7 +46,7 @@ check_latex2html_and_tex4ht ()
if echo "$remaining" | grep '[-]init mediawiki.pm' >/dev/null; then
if test "$no_html2wiki" = 'yes' ; then
echo "S: (no html2wiki) $current"
- continue 2
+ return 2
fi
fi
fi

View File

@ -3,7 +3,7 @@
Summary: Tools needed to create Texinfo format documentation files
Name: texinfo
Version: 6.7
Release: 9%{?dist}
Release: 10%{?dist}
License: GPLv3+
Url: http://www.gnu.org/software/texinfo/
Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
@ -19,6 +19,8 @@ Patch3: info-6.5-sync-fix-info-dir.patch
Patch4: texinfo-6.5-fix-info-dir.patch
# Patch5: fixes issues detected by static analysis
Patch5: texinfo-6.5-covscan-fixes.patch
# Patch6: fixes issue found by ShellCheck in test script
Patch6: texinfo-6.7-fix-function-exit.patch
BuildRequires: make
BuildRequires: gcc
@ -145,6 +147,9 @@ export ALL_TESTS=yes
%{_mandir}/man1/pdftexi2dvi.1*
%changelog
* Tue Feb 02 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.7-10
- Fix problem in shell code found by ShellCheck in test script
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild