Fix bug in fix-info-dir --delete.

This commit is contained in:
Jason Tibbitts 2018-06-19 19:29:30 -05:00
parent d0c23d81b7
commit edda81195c
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/contrib/fix-info-dir b/contrib/fix-info-dir
index 4439ada..c054787 100755
--- a/contrib/fix-info-dir
+++ b/contrib/fix-info-dir
@@ -294,7 +294,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

View File

@ -3,7 +3,7 @@
Summary: Tools needed to create Texinfo format documentation files
Name: texinfo
Version: 6.5
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv3+
Url: http://www.gnu.org/software/texinfo/
Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
@ -17,6 +17,9 @@ Patch1: texinfo-6.0-disable-failing-info-test.patch
Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
# Patch3: we need to fix template fix-info-dir generates
Patch3: info-6.5-sync-fix-info-dir.patch
# rhbz#1592433, bug in fix-info-dir --delete
Patch4: texinfo-6.5-fix-info-dir.patch
BuildRequires: gcc
BuildRequires: perl-generators
BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper)
@ -142,6 +145,10 @@ export ALL_TESTS=yes
%{_mandir}/man1/pdftexi2dvi.1*
%changelog
* Tue Jun 19 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 6.5-4
- Fix bug in fix-info-dir which prevented the transfiletriggerpostun script
from working properly.
* Tue Feb 13 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.5-3
- Implement transaction filetriggers for crating info/dir