From a1ee05d352ca2f5c981e0aa6a6be2d6cdaa59b9e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 24 Jun 2013 21:34:57 +0200 Subject: [PATCH] - updated to 5.1 (last texinfo 4.x left on texinfo-4 branch) - updated info patch, removed obsolete as_needed-fix,segv,automake_1_12 patches - autogenerate perl dependencies (all but info browser has been reimplemented in perl) --- texinfo-as_needed-fix.patch | 12 -- texinfo-automake_1_12.patch | 12 -- texinfo-info.patch | 408 ++++++++++++++++++++++-------------- texinfo-segv.patch | 20 -- texinfo.spec | 47 +++-- 5 files changed, 282 insertions(+), 217 deletions(-) delete mode 100644 texinfo-as_needed-fix.patch delete mode 100644 texinfo-automake_1_12.patch delete mode 100644 texinfo-segv.patch diff --git a/texinfo-as_needed-fix.patch b/texinfo-as_needed-fix.patch deleted file mode 100644 index 47f0d97..0000000 --- a/texinfo-as_needed-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur texinfo-4.8/configure.ac texinfo-4.8.as_needed-fix/configure.ac ---- texinfo-4.8/configure.ac 2004-12-31 19:00:48.000000000 +0100 -+++ texinfo-4.8.as_needed-fix/configure.ac 2006-08-02 02:37:33.000000000 +0200 -@@ -119,7 +119,7 @@ - # rather ncurses. So we check for it. - TERMLIBS= - # Check for termlib before termcap because Solaris termcap needs libucb. --TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" -+TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" - for termlib in ${TERMLIB_VARIANTS}; do - AC_CHECK_LIB(${termlib}, tgetent, - [TERMLIBS="${TERMLIBS} -l${termlib}"; break]) diff --git a/texinfo-automake_1_12.patch b/texinfo-automake_1_12.patch deleted file mode 100644 index 7cf72d1..0000000 --- a/texinfo-automake_1_12.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur texinfo-4.13.orig/configure.ac texinfo-4.13/configure.ac ---- texinfo-4.13.orig/configure.ac 2012-12-06 09:11:23.000000000 +0100 -+++ texinfo-4.13/configure.ac 2012-12-06 09:11:54.000000000 +0100 -@@ -13,7 +13,7 @@ - - dnl Must come before AM_INIT_AUTOMAKE. - AC_CONFIG_AUX_DIR([build-aux]) --AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-lzma]) -+AM_INIT_AUTOMAKE([1.10.1 readme-alpha]) - - # Minimum Autoconf version required. - AC_PREREQ(2.59) diff --git a/texinfo-info.patch b/texinfo-info.patch index 865c048..96ae588 100644 --- a/texinfo-info.patch +++ b/texinfo-info.patch @@ -1,51 +1,51 @@ ---- texinfo-4.7/doc/info-stnd.texi.orig 2004-03-24 02:41:06.000000000 +0100 -+++ texinfo-4.7/doc/info-stnd.texi 2004-04-12 13:07:58.150558008 +0200 -@@ -35,10 +35,10 @@ - @end quotation +--- texinfo-5.1/doc/info-stnd.texi.orig 2013-06-24 18:42:45.291932622 +0200 ++++ texinfo-5.1/doc/info-stnd.texi 2013-06-24 18:50:22.125246783 +0200 +@@ -41,10 +41,10 @@ + license to the document, as described in section 6 of the license. @end copying -@dircategory Texinfo documentation system +@dircategory Texinfo documentation system: @direntry --* info standalone: (info-stnd). Read Info documents without Emacs. +-* info stand-alone: (info-stnd). Read Info documents without Emacs. -* infokey: (info-stnd)Invoking infokey. Compile Info customizations. -+* info standalone: (info-stnd). Read Info documents without Emacs ++* info stand-alone: (info-stnd). Read Info documents without Emacs +* infokey: (info-stnd)infokey. Compile Info customizations @end direntry @titlepage -@@ -1963,12 +1963,12 @@ +@@ -2087,12 +2087,12 @@ textual source file using the @code{infokey} command. @menu --* Invoking infokey:: -+* infokey:: - * infokey source format:: +-* Invoking @t{infokey}:: ++* @t{infokey}:: + * @t{infokey} source format:: @end menu --@node Invoking infokey -+@node infokey +-@node Invoking @t{infokey} ++@node @t{infokey} @section Invoking @command{infokey} - @cindex invoking infokey ---- texinfo-4.7/doc/info.texi.orig 2004-04-06 10:21:35.000000000 +0200 -+++ texinfo-4.7/doc/info.texi 2004-04-12 13:08:41.859913176 +0200 -@@ -37,9 +37,9 @@ + @cindex invoking @command{infokey} +--- texinfo-5.1/doc/info.texi.orig 2013-06-24 18:51:07.731911536 +0200 ++++ texinfo-5.1/doc/info.texi 2013-06-24 18:53:43.138571681 +0200 +@@ -36,9 +36,9 @@ @end quotation @end copying -@dircategory Texinfo documentation system +@dircategory Texinfo documentation system: @direntry --* Info: (info). How to use the documentation browsing system. -+* Info: (info). The documentation browsing system +-* Info: (info). How to use the documentation browsing system. ++* Info: (info). How to use the documentation browsing system @end direntry @titlepage ---- texinfo-4.12/doc/texinfo.txi.orig 2008-04-09 19:07:31.000000000 +0200 -+++ texinfo-4.12/doc/texinfo.txi 2008-05-29 23:44:49.056866313 +0200 -@@ -56,15 +56,15 @@ +--- texinfo-5.1/doc/texinfo.txi.orig 2013-03-11 19:31:13.000000000 +0100 ++++ texinfo-5.1/doc/texinfo.txi 2013-06-24 19:07:23.441870590 +0200 +@@ -57,16 +57,16 @@ @end quotation @end copying @@ -54,181 +54,219 @@ @direntry -* Texinfo: (texinfo). The GNU documentation format. -* install-info: (texinfo)Invoking install-info. Update info/dir entries. +-* makeinfo: (texinfo)Invoking makeinfo. Translate Texinfo source. +-* pod2texi: (pod2texi)Invoking pod2texi. Translate Perl POD to Texinfo. -* texi2dvi: (texinfo)Format with texi2dvi. Print Texinfo documents. -* texi2pdf: (texinfo)PDF Output. PDF output for Texinfo. -* pdftexi2dvi: (texinfo)PDF Output. PDF output for Texinfo. -* texindex: (texinfo)Format with tex/texindex. Sort Texinfo index files. --* makeinfo: (texinfo)Invoking makeinfo. Translate Texinfo source. +* Texinfo: (texinfo). The GNU documentation format +* install-info: (texinfo)install-info. Update info/dir entries ++* makeinfo: (texinfo)makeinfo. Translate Texinfo source ++* pod2texi: (pod2texi)pod2texi. Translate Perl POD to Texinfo. +* texi2dvi: (texinfo)texi2dvi. Print Texinfo documents +* texi2pdf: (texinfo)texi2pdf. PDF output for Texinfo -+* pdftexi2dvi: (texinfo)pdftexi2dvi. PDF output for Texinfo -+* texindex: (texinfo)texindex. Sort Texinfo index files -+* makeinfo: (texinfo)makeinfo. Translate Texinfo source ++* pdftexi2dvi: (texinfo)pdftexi2dvi. PDF output for Texinfo ++* texindex: (texinfo)tex/texindex. Sort Texinfo index files @end direntry @c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a -@@ -568,8 +568,8 @@ +@@ -576,8 +576,8 @@ Formatting and Printing Hardcopy - * Use TeX:: Use @TeX{} to format for hardcopy. --* Format with tex/texindex:: How to format with explicit shell commands. --* Format with texi2dvi:: A simpler way to format. -+* texindex:: How to format with explicit shell commands. -+* texi2dvi:: A simpler way to format. - * Print with lpr:: How to print. + * Use @TeX{}:: Use @TeX{} to format for hardcopy. +-* Format with @t{tex}/@t{texindex}:: How to format with explicit shell commands. +-* Format with @t{texi2dvi}:: A simpler way to format. ++* @t{tex}/@t{texindex}:: How to format with explicit shell commands. ++* @t{texi2dvi}:: A simpler way to format. + * Print with @t{lpr}:: How to print. * Within Emacs:: How to format and print from an Emacs shell. * Texinfo Mode Printing:: How to format and print in Texinfo mode. -@@ -582,7 +582,7 @@ - * pagesizes:: How to print with customized page sizes. +@@ -590,18 +590,18 @@ + * @t{@@pagesizes}:: How to print with customized page sizes. * Cropmarks and Magnification:: How to print marks to indicate the size of pages and how to print scaled up output. -* PDF Output:: Portable Document Format output. +* texi2pdf:: Portable Document Format output. - * Obtaining TeX:: How to Obtain @TeX{}. + * Obtaining @TeX{}:: How to obtain @TeX{}. - Creating and Installing Info Files -@@ -593,7 +593,7 @@ - Creating an Info File + @code{texi2any}: The Generic Translator for Texinfo - * makeinfo advantages:: @code{makeinfo} provides better error checking. --* Invoking makeinfo:: How to run @code{makeinfo} from a shell. -+* makeinfo:: How to run @code{makeinfo} from a shell. - * makeinfo options:: Specify fill-column and other options. + * Reference Implementation:: @command{texi2any}: the reference implementation. +-* Invoking @t{texi2any}:: Running the translator from a shell. ++* @t{texi2any}:: Running the translator from a shell. + * @t{texi2any} Printed Output:: Calling @command{texi2dvi}. * Pointer Validation:: How to check that pointers point somewhere. - * makeinfo in Emacs:: How to run @code{makeinfo} from Emacs. -@@ -612,7 +612,7 @@ + * Customization Variables:: Configuring @command{texi2any}. + * Internationalization of Document Strings:: Translating program-inserted text. +-* Invoking @t{pod2texi}:: Translating Perl pod to Texinfo. ++* @t{pod2texi}:: Translating Perl pod to Texinfo. + * @t{texi2html}:: An ancestor of @command{texi2any}. + + Customization Variables +@@ -634,7 +634,7 @@ located in other directories. * Installing Dir Entries:: How to specify what menu entry to add to the Info directory. --* Invoking install-info:: @code{install-info} options. -+* install-info:: @code{install-info} options. +-* Invoking @t{install-info}:: @code{install-info} options. ++* @t{install-info}:: @code{install-info} options. Generating HTML -@@ -907,7 +907,7 @@ - @uref{http://tug.org/TUGboat/Articles/tb22-3/tb72beebe-pdf.pdf} has - some background. Texinfo uses the @command{pdftex} program, a variant - of @TeX{}, to output PDF; see +@@ -974,7 +974,7 @@ + @uref{http://tug.org/TUGboat/tb22-3/tb72beebe-pdf.pdf} have some + background. By default, Texinfo uses the @command{pdftex} program, a + variant of @TeX{}, to output PDF; see -@uref{http://tug.org/applications/pdftex}. @xref{PDF Output}. +@uref{http://tug.org/applications/pdftex}. @xref{texi2pdf}. - @item XML - @cindex XML output -@@ -2416,7 +2416,7 @@ - you must run the @code{texindex} command after first running the + @item Docbook + @cindex Docbook output, overview +@@ -2546,8 +2546,7 @@ + this, you must run the @code{texindex} command after first running the @code{tex} typesetting command; and then you must run the @code{tex} command again. Or else run the @code{texi2dvi} command which --automatically creates indices as needed (@pxref{Format with texi2dvi}). -+automatically creates indices as needed (@pxref{texi2dvi}). +-automatically creates indices as needed (@pxref{Format with +-@t{texi2dvi}}). ++automatically creates indices as needed (@pxref{@t{texi2dvi}}). Often, when you are writing a document, you want to typeset and print only part of a file to see what it will look like. You can use the -@@ -3612,8 +3612,8 @@ +@@ -3067,7 +3066,7 @@ + when generating Info, etc. The @code{\input} line is still ignored in + this processing, as well as leading blank lines. + +-See also the @option{--output} option in @ref{Invoking @t{texi2any}}. ++See also the @option{--output} option in @ref{@t{texi2any}}. + + + @node @t{@@settitle} +@@ -3699,8 +3698,8 @@ You need to include the @code{@@set@dots{}contentsaftertitlepage} commands early in the document (just after @code{@@setfilename}, for -example). We recommend using @command{texi2dvi} (@pxref{Format with --texi2dvi}) to specify this without altering the source file at all. For -+example). We recommend using @command{texi2dvi} (@pxref{texi2dvi}) -+to specify this without altering the source file at all. For - example: +-@t{texi2dvi}}) to specify this without altering the source file at ++example). We recommend using @command{texi2dvi} (@pxref{@t{texi2dvi}}) ++to specify this without altering the source file at + all. For example: + @example - texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi -@@ -14062,7 +14062,7 @@ - problems with @TeX{}. If you get macro-related errors when producing - the printed version of a manual, try expanding the macros with - @command{makeinfo} by invoking @command{texi2dvi} with the @samp{-E} --option (@pxref{Format with texi2dvi}). -+option (@pxref{texi2dvi}). +@@ -13688,7 +13687,7 @@ + extended @TeX{} programs @command{etex} (DVI output) and + @command{pdftex} (PDF output), such as @TeX{} Live 2008. + @command{texi2dvi} will use the extended @TeX{}s if they are available +-(@pxref{Format with @t{texi2dvi}}). ++(@pxref{@t{texi2dvi}}). + + In September 2006, the W3C Internationalization Activity released a + new recommendation for specifying languages: +@@ -14962,8 +14961,8 @@ + some of the caveats are listed below. Thus, if you get macro-related + errors when producing the printed version of a manual, you might try + expanding the macros with @command{makeinfo} by invoking +-@command{texi2dvi} with the @samp{-E} option (@pxref{Format with +-@t{texi2dvi}}). Or, more reliably, eschew Texinfo macros altogether ++@command{texi2dvi} with the @samp{-E} option (@pxref{@t{texi2dvi}}). ++Or, more reliably, eschew Texinfo macros altogether + and use a language designed for macro processing, such as M4 + (@pxref{External Macro Processors}). + +@@ -15377,8 +15376,8 @@ @itemize @bullet @item -@@ -14331,8 +14331,8 @@ +-If you run @command{texi2dvi} or its variants (@pxref{Format with +-@t{texi2dvi}}), you can pass @option{-E} and @command{texi2dvi} ++If you run @command{texi2dvi} or its variants (@pxref{@t{texi2dvi}}), ++you can pass @option{-E} and @command{texi2dvi} + will run @command{makeinfo} first to expand macros and eliminate + @samp{#line}. + +@@ -15743,8 +15742,8 @@ @menu - * Use TeX:: Use @TeX{} to format for hardcopy. --* Format with tex/texindex:: How to format with explicit shell commands. --* Format with texi2dvi:: A simpler way to format. -+* texindex:: How to format with explicit shell commands. -+* texi2dvi:: A simpler way to format. - * Print with lpr:: How to print. + * Use @TeX{}:: Use @TeX{} to format for hardcopy. +-* Format with @t{tex}/@t{texindex}:: How to format with explicit shell commands. +-* Format with @t{texi2dvi}:: A simpler way to format. ++* @t{tex}/@t{texindex}:: How to format with explicit shell commands. ++* @t{texi2dvi}:: A simpler way to format. + * Print with @t{lpr}:: How to print. * Within Emacs:: How to format and print from an Emacs shell. * Texinfo Mode Printing:: How to format and print in Texinfo mode. -@@ -14345,7 +14345,7 @@ - * pagesizes:: How to print with customized page sizes. +@@ -15757,7 +15756,7 @@ + * @t{@@pagesizes}:: How to print with customized page sizes. * Cropmarks and Magnification:: How to print marks to indicate the size of pages and how to print scaled up output. -* PDF Output:: Portable Document Format output. +* texi2pdf:: Portable Document Format output. - * Obtaining TeX:: How to Obtain @TeX{}. + * Obtaining @TeX{}:: How to obtain @TeX{}. @end menu -@@ -14364,7 +14364,7 @@ - File}). +@@ -15774,7 +15773,7 @@ + itself. + +-@node Format with @t{tex}/@t{texindex} ++@node @t{tex}/@t{texindex} + @section Format with @code{tex}/@code{texindex} --@node Format with tex/texindex -+@node texindex - @section Format with @code{tex} and @code{texindex} @cindex Shell formatting with @code{tex} and @code{texindex} - @cindex Formatting with @code{tex} and @code{texindex} -@@ -14461,7 +14461,7 @@ +@@ -15874,7 +15873,7 @@ @pindex texi2dvi Alternatively, it's a one-step process: run @code{texi2dvi} --(@pxref{Format with texi2dvi}). -+(@pxref{texi2dvi}). +-(@pxref{Format with @t{texi2dvi}}). ++(@pxref{@t{texi2dvi}}). You need not run @code{texindex} each time after you run @code{tex}. If you do not, on the next run, the @code{tex} formatting command will use -@@ -14493,7 +14493,7 @@ +@@ -15906,7 +15905,7 @@ (@pxref{Pointer Validation}). --@node Format with texi2dvi -+@node texi2dvi +-@node Format with @t{texi2dvi} ++@node @t{texi2dvi} @section Format with @code{texi2dvi} - @pindex texi2dvi @r{(shell script)} - -@@ -14530,7 +14530,7 @@ - @opindex --pdf @r{(@command{texi2dvi})} + @pindex texi2dvi @r{(shell script)} +@@ -15945,7 +15944,7 @@ + @opindex --pdf@r{, for @command{texi2dvi}} + @pindex pdftexi2dvi With the @option{--pdf} option, @command{texi2dvi} produces PDF output -instead of DVI (@pxref{PDF Output}), by running @command{pdftex} +instead of DVI (@pxref{texi2pdf}), by running @command{pdftex} instead of @command{tex}. Alternatively, the command @command{texi2pdf} is an abbreviation for running @samp{texi2dvi --pdf}. The command @command{pdftexi2dvi} is also supported as a -@@ -15107,7 +15107,7 @@ - @xref{small}, for information about - commands that make it easier to produce examples for a smaller manual. +@@ -16551,7 +16550,7 @@ + @xref{@t{@@small@dots{}}}, for information about commands that make + it easier to produce examples for a smaller manual. --@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for -+@xref{texi2dvi}, and @ref{Preparing for TeX,,Preparing for - @TeX{}}, for other ways to format with @code{@@smallbook} that do not - require changing the source file. +-@xref{Format with @t{texi2dvi}}, and @ref{Preparing for @TeX{}}, ++@xref{@t{texi2dvi}}, and @ref{Preparing for @TeX{}}, + for other ways to format with @code{@@smallbook} that do not require + changing the source file. -@@ -15137,7 +15137,7 @@ +@@ -16581,7 +16580,7 @@ @end group @end example --@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for -+@xref{texi2dvi}, and @ref{Preparing for TeX,,Preparing for - @TeX{}}, for other ways to format for different paper sizes that do not - require changing the source file. +-@xref{Format with @t{texi2dvi}}, and @ref{Preparing for @TeX{}}, ++@xref{@t{texi2dvi}}, and @ref{Preparing for @TeX{}}, + for other ways to format for different paper sizes that do not require + changing the source file. -@@ -15183,7 +15183,7 @@ - margins, you must define a new command in @file{texinfo.tex} (or - @file{texinfo.cnf}, @pxref{Preparing for TeX,,Preparing for @TeX{}}). +@@ -16630,7 +16629,7 @@ + margins, you must define a new command in @file{texinfo.tex} or + @file{texinfo.cnf}. --@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for -+@xref{texi2dvi}, and @ref{Preparing for TeX,,Preparing for - @TeX{}}, for other ways to specify @code{@@pagesizes} that do not - require changing the source file. +-@xref{Format with @t{texi2dvi}}, and @ref{Preparing for @TeX{}}, ++@xref{@t{texi2dvi}}, and @ref{Preparing for @TeX{}}, + for other ways to specify @code{@@pagesizes} that do not require + changing the source file. -@@ -15252,7 +15252,7 @@ +@@ -16698,7 +16697,7 @@ magnifications. Be prepared to experiment. @@ -237,43 +275,96 @@ @section PDF Output @cindex PDF output -@@ -15260,7 +15260,7 @@ +@@ -16706,7 +16705,7 @@ The simplest way to generate PDF output from Texinfo source is to run the convenience script @command{texi2pdf} (or @command{pdftexi2dvi}); - this simply executes the @command{texi2dvi} script with the --@option{--pdf} option (@pxref{Format with texi2dvi}). If for some -+@option{--pdf} option (@pxref{texi2dvi}). If for some - reason you want to process the document by hand, simply run the - @command{pdftex} program instead of plain @command{tex}. That is, run - @samp{pdftex foo.texi} instead of @samp{tex foo.texi}. -@@ -15364,7 +15364,7 @@ + this executes the @command{texi2dvi} script with the @option{--pdf} +-option (@pxref{Format with @t{texi2dvi}}). If for some reason you ++option (@pxref{@t{texi2dvi}}). If for some reason you + want to process the document by hand, you can run the @command{pdftex} + program instead of plain @command{tex}. That is, run @samp{pdftex + foo.texi} instead of @samp{tex foo.texi}. +@@ -16790,12 +16789,12 @@ @menu - * makeinfo advantages:: @code{makeinfo} provides better error checking. --* Invoking makeinfo:: How to run @code{makeinfo} from a shell. -+* makeinfo:: How to run @code{makeinfo} from a shell. - * makeinfo options:: Specify fill-column and other options. + * Reference Implementation:: @command{texi2any}: the reference implementation. +-* Invoking @t{texi2any}:: Running the translator from a shell. ++* @t{texi2any}:: Running the translator from a shell. + * @t{texi2any} Printed Output:: Calling @command{texi2dvi}. * Pointer Validation:: How to check that pointers point somewhere. - * makeinfo in Emacs:: How to run @code{makeinfo} from Emacs. -@@ -15396,7 +15396,7 @@ - @code{makeinfo}. + * Customization Variables:: Configuring @command{texi2any}. + * Internationalization of Document Strings:: Translating program-inserted text. +-* Invoking @t{pod2texi}:: Translating Perl pod to Texinfo. ++* @t{pod2texi}:: Translating Perl pod to Texinfo. + * @t{texi2html}:: An ancestor of @command{texi2any}. + @end menu +@@ -16856,10 +16855,10 @@ + @command{texi2any}. --@node Invoking makeinfo -+@node makeinfo - @subsection Running @code{makeinfo} from a Shell - @pindex makeinfo -@@ -16111,7 +16111,7 @@ +-@node Invoking @t{texi2any} ++@node @t{texi2any} + @section Invoking @command{texi2any}/@code{makeinfo} from a Shell + +-@anchor{Invoking makeinfo} ++@anchor{makeinfo} + @pindex makeinfo + @pindex texi2any + +@@ -17383,8 +17383,8 @@ + requested. + + The output format options for this are @option{--dvi}, +-@option{--dvipdf}, @option{--pdf}, and @option{--ps}. @xref{Format +-with @t{texi2dvi}}, for more details on these options and general ++@option{--dvipdf}, @option{--pdf}, and @option{--ps}. @xref{@t{texi2dvi}}, ++for more details on these options and general + @command{texi2dvi} operation. In addition, the @option{--verbose}, + @option{--silent}, and @option{--quiet} options are passed on if + specified; the @option{-I} and @option{-o} options are likewise passed +@@ -17554,7 +17553,7 @@ + @cindex Options, customization variables for + + The following table gives the customization variables associated with +-some command line options. @xref{Invoking @t{texi2any}}, for the ++some command line options. @xref{@t{texi2any}}, for the + meaning of the options. + + @multitable @columnfractions 0.5 0.5 +@@ -17629,7 +17628,7 @@ + @itemx xml + These correspond to the command-line options (and + @code{TEXINFO_OUTPUT_FORMAT} environment variable values) of the same +-name. @xref{Invoking @t{texi2any}}. ++name. @xref{@t{texi2any}}. + + @item debugcount + Instead of generating a regular output format, output the count of +@@ -18432,11 +18431,11 @@ + appropriately in many languages. + + +-@node Invoking @t{pod2texi} ++@node @t{pod2texi} + @section Invoking @t{pod2texi}: + + @pindex pod2texi +-@cindex Invoking @code{pod2texi} ++@cindex @code{pod2texi} + @cindex POD, converting to Texinfo + @cindex Perl POD, converting to Texinfo + +@@ -18884,7 +18883,7 @@ located in other directories. * Installing Dir Entries:: How to specify what menu entry to add to the Info directory. --* Invoking install-info:: @code{install-info} options. -+* install-info:: @code{install-info} options. +-* Invoking @t{install-info}:: @code{install-info} options. ++* @t{install-info}:: @code{install-info} options. @end menu -@@ -16359,7 +16359,7 @@ +@@ -19122,7 +19121,7 @@ @@dircategory Texinfo documentation system @@direntry * Texinfo: (texinfo). The GNU documentation format. @@ -282,7 +373,7 @@ @dots{} @@end direntry @end smallexample -@@ -16370,7 +16370,7 @@ +@@ -19133,7 +19132,7 @@ INFO-DIR-SECTION Texinfo documentation system START-INFO-DIR-ENTRY * Texinfo: (texinfo). The GNU documentation format. @@ -291,30 +382,39 @@ @dots{} END-INFO-DIR-ENTRY @end smallexample -@@ -16392,7 +16392,7 @@ +@@ -19155,7 +19154,7 @@ most others. Description for individual utilities best start in column 48, where possible. For more information about formatting see the @samp{--calign}, @samp{--align}, and @samp{--max-width} options in --@ref{Invoking install-info}. -+@ref{install-info}. +-@ref{Invoking @t{install-info}}. ++@ref{@t{install-info}}. If you use @code{@@dircategory} more than once in the Texinfo source, each usage specifies the `current' category; any subsequent -@@ -16427,7 +16427,7 @@ +@@ -19190,7 +19189,7 @@ traditional @command{man} system. --@node Invoking install-info -+@node install-info +-@node Invoking @t{install-info} ++@node @t{install-info} @subsection Invoking @command{install-info} - @pindex install-info - -@@ -17050,7 +17050,7 @@ - In standard Texinfo, node names may not contain @@-commands. - @command{makeinfo} has an option @option{--commands-in-node-names} --which partially supports it (@pxref{Invoking makeinfo}), but it is not -+which partially supports it (@pxref{makeinfo}), but it is not - robust and not recommended. - - Thus, @command{makeinfo} also does not fully implement this part of + @pindex install-info +@@ -19481,7 +19480,7 @@ + (@code{thead}, @code{abbr}, @code{acronym}). + + Using @samp{--init-file=html32.pm} produces strict HTML@tie{}3.2 +-output (@pxref{Invoking @t{texi2any}}). ++output (@pxref{@t{texi2any}}). + + Please report output from an error-free run of @code{makeinfo} which + has browser portability problems as a bug (@pxref{Reporting Bugs}). +@@ -19512,7 +19511,7 @@ + @code{CASE_INSENSITIVE_FILENAMES}. + + It is also possible to split at chapters or sections with +-@option{--split} (@pxref{Invoking @t{texi2any}}). In that case, ++@option{--split} (@pxref{@t{texi2any}}). In that case, + the file names are constructed after the name of the node associated + with the relevant sectioning command. Also, unless + @option{--no-node-files} is specified, a redirection file is output diff --git a/texinfo-segv.patch b/texinfo-segv.patch deleted file mode 100644 index 46fc4b9..0000000 --- a/texinfo-segv.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- texinfo-4.13/makeinfo/sectioning.c.org 2008-11-03 23:01:26.957799459 +0100 -+++ texinfo-4.13/makeinfo/sectioning.c 2008-11-03 23:02:10.180927044 +0100 -@@ -256,14 +256,14 @@ - return xstrdup (""); - else if (enum_marker == APPENDIX_MAGIC) - { -- char s[1]; -+ char s[2]; -- sprintf (s, "%c", numbers[0] + 64); -+ snprintf (s, sizeof(s), "%c", numbers[0] + 64); - return xstrdup (s); - } - else - { - char s[5]; -- sprintf (s, "%d", numbers[0]); -+ snprintf (s, sizeof(s), "%d", numbers[0]); - return xstrdup (s); - } - } diff --git a/texinfo.spec b/texinfo.spec index d59fdaf..8ca7d20 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,3 +1,4 @@ +%include /usr/lib/rpm/macros.perl Summary: Tools needed to create Texinfo format documentation files Summary(de.UTF-8): Tools zum Erstellen von texinfo-Dokumentationsdateien Summary(es.UTF-8): Formateador texinfo y lector de archivos info @@ -8,24 +9,25 @@ Summary(ru.UTF-8): Инструменты для создания файлов Summary(tr.UTF-8): texinfo biçimleyici ve info okuyucu Summary(uk.UTF-8): Інструменти для створення файлів документації формату Texinfo Name: texinfo -Version: 4.13a -Release: 7 +Version: 5.1 +Release: 1 License: GPL v3+ Group: Applications/Publishing -Source0: http://ftp.gnu.org/gnu/texinfo/%{name}-%{version}.tar.lzma -# Source0-md5: 20b37e49464bd72df4c6cfba33340f87 +Source0: http://ftp.gnu.org/gnu/texinfo/%{name}-%{version}.tar.xz +# Source0-md5: 52ee905a3b705020d2a1b6ec36d53ca6 Source1: info.desktop Patch0: %{name}-info.patch -Patch1: %{name}-as_needed-fix.patch -Patch2: %{name}-segv.patch -Patch3: %{name}-automake_1_12.patch URL: http://texinfo.org/ -BuildRequires: autoconf >= 2.59 -BuildRequires: automake >= 1:1.10.1 -BuildRequires: gettext-devel >= 0.17 +BuildRequires: autoconf >= 2.69 +BuildRequires: automake >= 1:1.12 +BuildRequires: gettext-devel >= 0.18.2 BuildRequires: help2man BuildRequires: ncurses-devel >= 5.0 +BuildRequires: perl-modules >= 1:5.8.0 BuildRequires: rpm >= 4.4.9-56 +BuildRequires: rpm-perlprov +BuildRequires: tar >= 1:1.22 +BuildRequires: xz BuildRequires: zlib-devel Requires: info = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -180,12 +182,8 @@ Texinfo to dvi conversion tool. Narzędzie do konwersji plików texinfo na dvi. %prep -%setup -q -c -T -n %{name}-4.13 -lzma -dc %{SOURCE0} | tar xf - -C .. +%setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %{__aclocal} -I gnulib/m4 @@ -207,7 +205,14 @@ ln -sf %{_sbindir}/install-info $RPM_BUILD_ROOT/sbin/install-info install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{de.us-ascii,de}/LC_MESSAGES/texinfo_document.mo +%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{es.us-ascii,es}/LC_MESSAGES/texinfo_document.mo +%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{no.us-ascii,nb}/LC_MESSAGES/texinfo_document.mo +%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{pt.us-ascii,pt} +%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{pt_BR.us-ascii,pt_BR} + %find_lang %{name} +%find_lang texinfo_document %clean rm -rf $RPM_BUILD_ROOT @@ -218,21 +223,25 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%post -n info -p /sbin/postshell +%post -n info -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -n info -p /sbin/postshell +%postun -n info -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%files +%files -f texinfo_document.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog INTRODUCTION NEWS README TODO +%doc AUTHORS ChangeLog NEWS README TODO %attr(755,root,root) %{_bindir}/makeinfo +%attr(755,root,root) %{_bindir}/pod2texi +%attr(755,root,root) %{_bindir}/texi2any %attr(755,root,root) %{_bindir}/texindex %{_datadir}/texinfo %{_infodir}/texinfo* %{_mandir}/man1/makeinfo.1* +%{_mandir}/man1/pod2texi.1* +%{_mandir}/man1/texi2any.1* %{_mandir}/man1/texindex.1* %{_mandir}/man5/texinfo.5* -- 2.43.0