diff --git a/texinfo-20180310-texinfo.tex.patch b/texinfo-20180310-texinfo.tex.patch
new file mode 100644
index 0000000..526fd22
--- /dev/null
+++ b/texinfo-20180310-texinfo.tex.patch
@@ -0,0 +1,311 @@
+diff -up texinfo-6.5/doc/texinfo.tex.old texinfo-6.5/doc/texinfo.tex
+--- texinfo-6.5/doc/texinfo.tex.old 2017-08-27 05:21:32.000000000 -0400
++++ texinfo-6.5/doc/texinfo.tex 2018-03-10 08:40:29.000000000 -0500
+@@ -3,11 +3,11 @@
+ % Load plain if necessary, i.e., if running under initex.
+ \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
+ %
+-\def\texinfoversion{2017-08-23.19}
++\def\texinfoversion{2018-03-10.14}
+ %
+ % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+ % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+-% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
++% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+ % Free Software Foundation, Inc.
+ %
+ % This texinfo.tex file is free software: you can redistribute it and/or
+@@ -21,7 +21,7 @@
+ % General Public License for more details.
+ %
+ % You should have received a copy of the GNU General Public License
+-% along with this program. If not, see .
++% along with this program. If not, see .
+ %
+ % As a special exception, when this file is read by TeX when processing
+ % a Texinfo source document, you may use the result without
+@@ -30,9 +30,9 @@
+ %
+ % Please try the latest version of texinfo.tex before submitting bug
+ % reports; you can get the latest version from:
+-% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
+-% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
+-% http://www.gnu.org/software/texinfo/ (the Texinfo home page)
++% https://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
++% https://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
++% https://www.gnu.org/software/texinfo/ (the Texinfo home page)
+ % The texinfo.tex in any given distribution could well be out
+ % of date, so if that's what you're using, please check.
+ %
+@@ -56,7 +56,7 @@
+ % extent. You can get the existing language-specific files from the
+ % full Texinfo distribution.
+ %
+-% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
++% The GNU Texinfo home page is https://www.gnu.org/software/texinfo.
+
+
+ \message{Loading texinfo [version \texinfoversion]:}
+@@ -2235,6 +2235,20 @@ end
+ \font\smallersy=cmsy8
+ \def\smallerecsize{0800}
+
++% Fonts for math mode superscripts (7pt).
++\def\sevennominalsize{7pt}
++\setfont\sevenrm\rmshape{7}{1000}{OT1}
++\setfont\seventt\ttshape{10}{700}{OT1TT}
++\setfont\sevenbf\bfshape{10}{700}{OT1}
++\setfont\sevenit\itshape{7}{1000}{OT1IT}
++\setfont\sevensl\slshape{10}{700}{OT1}
++\setfont\sevensf\sfshape{10}{700}{OT1}
++\setfont\sevensc\scshape{10}{700}{OT1}
++\setfont\seventtsl\ttslshape{10}{700}{OT1TT}
++\font\seveni=cmmi7
++\font\sevensy=cmsy7
++\def\sevenecsize{0700}
++
+ % Fonts for title page (20.4pt):
+ \def\titlenominalsize{20pt}
+ \setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+@@ -2369,6 +2383,20 @@ end
+ \font\smallersy=cmsy8
+ \def\smallerecsize{0800}
+
++% Fonts for math mode superscripts (7pt).
++\def\sevennominalsize{7pt}
++\setfont\sevenrm\rmshape{7}{1000}{OT1}
++\setfont\seventt\ttshape{10}{700}{OT1TT}
++\setfont\sevenbf\bfshape{10}{700}{OT1}
++\setfont\sevenit\itshape{7}{1000}{OT1IT}
++\setfont\sevensl\slshape{10}{700}{OT1}
++\setfont\sevensf\sfshape{10}{700}{OT1}
++\setfont\sevensc\scshape{10}{700}{OT1}
++\setfont\seventtsl\ttslshape{10}{700}{OT1TT}
++\font\seveni=cmmi7
++\font\sevensy=cmsy7
++\def\sevenecsize{0700}
++
+ % Fonts for title page (20.4pt):
+ \def\titlenominalsize{20pt}
+ \setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+@@ -2503,13 +2531,20 @@ end
+
+
+ % In order for the font changes to affect most math symbols and letters,
+-% we have to define the \textfont of the standard families. We don't
+-% bother to reset \scriptfont and \scriptscriptfont; awaiting user need.
++% we have to define the \textfont of the standard families.
++% We don't bother to reset \scriptscriptfont; awaiting user need.
+ %
+ \def\resetmathfonts{%
+ \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont
+ \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont
+ \textfont\ttfam=\ttfont \textfont\sffam=\sffont
++ %
++ % Fonts for superscript. Note that the 7pt fonts are used regardless
++ % of the current font size.
++ \scriptfont0=\sevenrm \scriptfont1=\seveni \scriptfont2=\sevensy
++ \scriptfont\itfam=\sevenit \scriptfont\slfam=\sevensl
++ \scriptfont\bffam=\sevenbf \scriptfont\ttfam=\seventt
++ \scriptfont\sffam=\sevensf
+ }
+
+ %
+@@ -2519,6 +2554,9 @@ end
+ % to also set the current \fam for math mode. Our \STYLE (e.g., \rm)
+ % commands hardwire \STYLEfont to set the current font.
+ %
++% The fonts used for \ifont are for "math italics" (\itfont is for italics
++% in regular text). \syfont is also used in math mode only.
++%
+ % Each font-changing command also sets the names \lsize (one size lower)
+ % and \lllsize (three sizes lower). These relative commands are used
+ % in, e.g., the LaTeX logo and acronyms.
+@@ -2619,26 +2657,11 @@ end
+ % Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
+ % define and register \INITMACRO to be called on markup style changes.
+ % \INITMACRO can check \currentmarkupstyle for the innermost
+-% style and the set of \ifmarkupSTYLE switches for all styles
+-% currently in effect.
+-\newif\ifmarkupvar
+-\newif\ifmarkupsamp
+-\newif\ifmarkupkey
+-%\newif\ifmarkupfile % @file == @samp.
+-%\newif\ifmarkupoption % @option == @samp.
+-\newif\ifmarkupcode
+-\newif\ifmarkupkbd
+-%\newif\ifmarkupenv % @env == @code.
+-%\newif\ifmarkupcommand % @command == @code.
+-\newif\ifmarkuptex % @tex (and part of @math, for now).
+-\newif\ifmarkupexample
+-\newif\ifmarkupverb
+-\newif\ifmarkupverbatim
++% style.
+
+ \let\currentmarkupstyle\empty
+
+ \def\setupmarkupstyle#1{%
+- \csname markup#1true\endcsname
+ \def\currentmarkupstyle{#1}%
+ \markupstylesetup
+ }
+@@ -2700,11 +2723,15 @@ end
+ % lilypond developers report. xpdf does work with the regular 0x27.
+ %
+ \def\codequoteright{%
+- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
+- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+- '%
++ \ifmonospace
++ \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
++ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
++ '%
++ \else \char'15 \fi
+ \else \char'15 \fi
+- \else \char'15 \fi
++ \else
++ '%
++ \fi
+ }
+ %
+ % and a similar option for the left quote char vs. a grave accent.
+@@ -2712,13 +2739,17 @@ end
+ % the code environments to do likewise.
+ %
+ \def\codequoteleft{%
+- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
+- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+- % [Knuth] pp. 380,381,391
+- % \relax disables Spanish ligatures ?` and !` of \tt font.
+- \relax`%
++ \ifmonospace
++ \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
++ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
++ % [Knuth] pp. 380,381,391
++ % \relax disables Spanish ligatures ?` and !` of \tt font.
++ \relax`%
++ \else \char'22 \fi
+ \else \char'22 \fi
+- \else \char'22 \fi
++ \else
++ \relax`%
++ \fi
+ }
+
+ % Commands to set the quote options.
+@@ -5969,24 +6000,30 @@ end
+ % Split the last of the double-column material.
+ \savemarks
+ \balancecolumns
+- %
++ }%
++ \eject % call the \output just set
++ \ifdim\pagetotal=0pt
+ % Having called \balancecolumns once, we do not
+ % want to call it again. Therefore, reset \output to its normal
+ % definition right away.
+ \global\output = {\onepageout{\pagecontents\PAGE}}%
+- }%
+- \eject
+- \endgroup % started in \begindoublecolumns
+- \restoremarks
+- % Leave the double-column material on the current page, no automatic
+- % page break.
+- \box\balancedcolumns
+- %
+- % \pagegoal was set to the doubled \vsize above, since we restarted
+- % the current page. We're now back to normal single-column
+- % typesetting, so reset \pagegoal to the normal \vsize.
+- \global\vsize = \txipageheight %
+- \pagegoal = \txipageheight %
++ %
++ \endgroup % started in \begindoublecolumns
++ \restoremarks
++ % Leave the double-column material on the current page, no automatic
++ % page break.
++ \box\balancedcolumns
++ %
++ % \pagegoal was set to the doubled \vsize above, since we restarted
++ % the current page. We're now back to normal single-column
++ % typesetting, so reset \pagegoal to the normal \vsize.
++ \global\vsize = \txipageheight %
++ \pagegoal = \txipageheight %
++ \else
++ % We had some left-over material. This might happen when \doublecolumnout
++ % is called in \balancecolumns. Try again.
++ \expandafter\enddoublecolumns
++ \fi
+ }
+ \newbox\balancedcolumns
+ \setbox\balancedcolumns=\vbox{shouldnt see this}%
+@@ -6001,6 +6038,7 @@ end
+ \ifdim\dimen@<5\baselineskip
+ % Don't split a short final column in two.
+ \setbox2=\vbox{}%
++ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
+ \else
+ \divide\dimen@ by 2 % target to split to
+ \dimen@ii = \dimen@
+@@ -6016,15 +6054,15 @@ end
+ \repeat
+ }%
+ % Now the left column is in box 1, and the right column in box 3.
++ %
+ % Check whether the left column has come out higher than the page itself.
+ % (Note that we have doubled \vsize for the double columns, so
+ % the actual height of the page is 0.5\vsize).
+ \ifdim2\ht1>\vsize
+- % Just split the last of the double column material roughly in half.
+- \setbox2=\box0
+- \setbox0 = \vsplit2 to \dimen@ii
+- \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}%
+- \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}%
++ % It appears that we have been called upon to balance too much material.
++ % Output some of it with \doublecolumnout, leaving the rest on the page.
++ \setbox\PAGE=\box0
++ \doublecolumnout
+ \else
+ % Compare the heights of the two columns.
+ \ifdim4\ht1>5\ht3
+@@ -6037,10 +6075,10 @@ end
+ \setbox2=\vbox to\ht1{\unvbox3\unskip}%
+ \setbox0=\vbox to\ht1{\unvbox1\unskip}%
+ \fi
++ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
+ \fi
+ \fi
+ %
+- \global\setbox\balancedcolumns=\vbox{\pagesofar}%
+ }
+ \catcode`\@ = \other
+
+@@ -9446,7 +9484,7 @@ end
+ \newif\ifwarnednoepsf
+ \newhelp\noepsfhelp{epsf.tex must be installed for images to
+ work. It is also included in the Texinfo distribution, or you can get
+- it from ftp://tug.org/tex/epsf.tex.}
++ it from https://ctan.org/texarchive/macros/texinfo/texinfo/doc/epsf.tex.}
+ %
+ \def\image#1{%
+ \ifx\epsfbox\thisisundefined
+@@ -11425,9 +11463,11 @@ directory should work if nowhere else do
+ %
+ \dimen0 = #1\relax
+ \advance\dimen0 by \voffset
++ \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page
+ %
+ \dimen2 = \hsize
+ \advance\dimen2 by \normaloffset
++ \advance\dimen2 by 1in % reference point is 1 inch from left edge of page
+ %
+ \internalpagesizes{#1}{\hsize}%
+ {\voffset}{\normaloffset}%
+@@ -11675,7 +11715,7 @@ directory should work if nowhere else do
+ @markupsetuprqdefault
+
+ @c Local variables:
+-@c eval: (add-hook 'write-file-hooks 'time-stamp)
++@c eval: (add-hook 'before-save-hook 'time-stamp)
+ @c page-delimiter: "^\\\\message\\|emacs-page"
+ @c time-stamp-start: "def\\\\texinfoversion{"
+ @c time-stamp-format: "%:y-%02m-%02d.%02H"
diff --git a/texinfo.spec b/texinfo.spec
index a066921..103ff7c 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,8 @@ 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
+# Update to 2018-03-10 texinfo.tex
+Patch4: texinfo-20180310-texinfo.tex.patch
BuildRequires: gcc
BuildRequires: perl-generators
BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper)
@@ -142,6 +144,9 @@ export ALL_TESTS=yes
%{_mandir}/man1/pdftexi2dvi.1*
%changelog
+* Fri Mar 30 2018 Tom Callaway - 6.5-4
+- update texinfo.tex
+
* Tue Feb 13 2018 Igor Gnatenko - 6.5-3
- Implement transaction filetriggers for crating info/dir