From edda81195ce5f424296122e20c31c10594e5e467 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Jun 20 2018 00:29:30 +0000 Subject: Fix bug in fix-info-dir --delete. --- diff --git a/texinfo-6.5-fix-info-dir.patch b/texinfo-6.5-fix-info-dir.patch new file mode 100644 index 0000000..80eec4c --- /dev/null +++ b/texinfo-6.5-fix-info-dir.patch @@ -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 diff --git a/texinfo.spec b/texinfo.spec index a066921..997286b 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -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 - 6.5-4 +- Fix bug in fix-info-dir which prevented the transfiletriggerpostun script + from working properly. + * Tue Feb 13 2018 Igor Gnatenko - 6.5-3 - Implement transaction filetriggers for crating info/dir