From a2e5fb4a3808a6eb2a36f74a432790220b2d8dd1 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Mon, 19 Sep 2016 14:42:27 +0200
Subject: [PATCH] Update to texinfo-6.3

---
 .gitignore                     | 14 ++------------
 sources                        |  4 ++--
 texinfo-6.1-texi2dvi-fix.patch | 29 -----------------------------
 texinfo.spec                   | 17 +++++++++--------
 4 files changed, 13 insertions(+), 51 deletions(-)
 delete mode 100644 texinfo-6.1-texi2dvi-fix.patch

diff --git a/.gitignore b/.gitignore
index a0b5d68..3d7038f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,2 @@
-texinfo-4.13a.tar.lzma
-texinfo-4.13a.tar.lzma.sig
-/texinfo-5.0.tar.xz
-/texinfo-5.0.tar.xz.sig
-/texinfo-5.1.tar.xz
-/texinfo-5.1.tar.xz.sig
-/texinfo-5.2.tar.xz
-/texinfo-5.2.tar.xz.sig
-/texinfo-6.0.tar.xz
-/texinfo-6.0.tar.xz.sig
-/texinfo-6.1.tar.xz
-/texinfo-6.1.tar.xz.sig
+/texinfo-6.3.tar.xz
+/texinfo-6.3.tar.xz.sig
diff --git a/sources b/sources
index f75095e..0ff358a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1d7ec1888fae00730693597852b00cde  texinfo-6.1.tar.xz
-d58158e37a901cff25d2cb4dab4a04a6  texinfo-6.1.tar.xz.sig
+32baefe5c7080dfb512a4eac5ce67b2a  texinfo-6.3.tar.xz
+aca1ba19ab06e46e07cb3db6cf7aa397  texinfo-6.3.tar.xz.sig
diff --git a/texinfo-6.1-texi2dvi-fix.patch b/texinfo-6.1-texi2dvi-fix.patch
deleted file mode 100644
index 281a19f..0000000
--- a/texinfo-6.1-texi2dvi-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up texinfo-6.1/util/texi2dvi.orig texinfo-6.1/util/texi2dvi
---- texinfo-6.1/util/texi2dvi.orig	2016-02-06 13:21:52.000000000 +0100
-+++ texinfo-6.1/util/texi2dvi	2016-02-24 09:36:18.726954888 +0100
-@@ -988,15 +988,16 @@ run_bibtex ()
- #                         that match PREDICATE.
- filter_files ()
- {
--  test -n "$xref_files_new" && echo "$xref_files_new" |
--  # Filter existing files matching the criterion.
--  #
--  while read file; do
--    $1 "$file"
--  done |
--  sort |
--  # Some files are opened several times, e.g., listings.sty's *.vrb.
--  uniq
-+  test -n "$xref_files_new" || return 0
-+  echo "$xref_files_new" |
-+    # Filter existing files matching the criterion.
-+    #
-+    while read file; do
-+      $1 "$file"
-+    done |
-+    sort |
-+    # Some files are opened several times, e.g., listings.sty's *.vrb.
-+    uniq
- }
- 
- # run_index - Run texindex (or makeindex or texindy) on current index
diff --git a/texinfo.spec b/texinfo.spec
index 2681836..bf8505b 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -2,8 +2,8 @@
 
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
-Version: 6.1
-Release: 3%{?dist}
+Version: 6.3
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -15,10 +15,8 @@ Source5: macros.info
 Patch0: texinfo-4.12-zlib.patch
 # Patch1: this is needed just for koji/mock, all test pass fine in local build
 Patch1: texinfo-6.0-disable-failing-info-test.patch
-# Patch2: rhbz#1309702, already upstream
-Patch2: texinfo-6.1-texi2dvi-fix.patch
-# Patch3: rhbz#1348671, because of OSTree
-Patch3: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
+# Patch2: rhbz#1348671, because of OSTree
+Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: perl >= 5.7.3, perl(Text::Unidecode)
@@ -70,8 +68,7 @@ for printing using TeX.
 %setup -q
 %patch0 -p1 -b .zlib
 %patch1 -p1 -b .disable-failing-info-test
-%patch2 -p1 -b .texi2dvi-fix
-%patch3 -p1 -b .orig
+%patch2 -p1 -b .install-info-use-create-tmp-then-rename-pattern
 
 %build
 %configure --with-external-Text-Unidecode \
@@ -174,6 +171,10 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Mon Sep 19 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3-1
+- Update to texinfo-6.3
+  Resolves: #1374962
+
 * Wed Jun 22 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.1-3
 - install-info: use create-tmp-then-rename pattern because of OSTree
   (patch by Colin Walters)