From 40141f578c7c46af15727bae38c24755d8677f3d318e65b8f24686a80d6f5389 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 11 Mar 2008 17:11:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texinfo?expand=0&rev=5 --- help2man-1.36.4.tar.bz2 | 3 + ...-4.9-zlib.patch => texinfo-4.11-zlib.patch | 130 +++---- texinfo-4.11.dif | 88 +++++ texinfo-4.11.tar.bz2 | 3 + texinfo-4.8-sec.patch | 11 - texinfo-4.8-tempfile.patch | 93 ----- texinfo-4.8-xml.patch | 90 ----- texinfo-4.9.dif | 7 +- texinfo-4.9.tar.bz2 | 3 - texinfo.changes | 56 +++ texinfo.spec | 321 +++++++++++------- 11 files changed, 421 insertions(+), 384 deletions(-) create mode 100644 help2man-1.36.4.tar.bz2 rename texinfo-4.9-zlib.patch => texinfo-4.11-zlib.patch (91%) create mode 100644 texinfo-4.11.dif create mode 100644 texinfo-4.11.tar.bz2 delete mode 100644 texinfo-4.8-sec.patch delete mode 100644 texinfo-4.8-tempfile.patch delete mode 100644 texinfo-4.8-xml.patch delete mode 100644 texinfo-4.9.tar.bz2 diff --git a/help2man-1.36.4.tar.bz2 b/help2man-1.36.4.tar.bz2 new file mode 100644 index 0000000..f5f8852 --- /dev/null +++ b/help2man-1.36.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b96d2f558182be272669a0e8f50f533d48d3315052bbd7915133f91acc91daca +size 71139 diff --git a/texinfo-4.9-zlib.patch b/texinfo-4.11-zlib.patch similarity index 91% rename from texinfo-4.9-zlib.patch rename to texinfo-4.11-zlib.patch index 9efbad9..eedfea9 100644 --- a/texinfo-4.9-zlib.patch +++ b/texinfo-4.11-zlib.patch @@ -1,20 +1,20 @@ --- config.in -+++ config.in 2004-04-21 12:18:07.000000000 +0200 -@@ -326,6 +326,9 @@ - /* Define to 1 if you have the `__secure_getenv' function. */ - #undef HAVE___SECURE_GETENV ++++ config.in 2008-03-10 13:01:00.285448994 +0100 +@@ -328,6 +328,9 @@ + /* Define if you have the 'wint_t' type. */ + #undef HAVE_WINT_T +/* Define to 1 if you have libzio for opening compressed info files */ +#undef HAVE_ZIO + - /* Define as const if the declaration of iconv() needs const. */ - #undef ICONV_CONST + /* Define to 1 if you have the `_ftime' function. */ + #undef HAVE__FTIME --- configure -+++ configure 2007-07-11 12:35:04.247562161 +0200 -@@ -13510,6 +13510,653 @@ _ACEOF - - ++++ configure 2008-03-10 12:59:04.926680264 +0100 +@@ -13528,6 +13528,653 @@ cat >>confdefs.h <<_ACEOF + #define HAVE_DECL_WCWIDTH 1 + _ACEOF +# +# Check for zlib and libbz2 libraries to use this together @@ -664,13 +664,13 @@ + + - ac_config_files="$ac_config_files Makefile doc/Makefile info/Makefile intl/Makefile lib/Makefile m4/Makefile makeinfo/Makefile makeinfo/tests/Makefile po/Makefile.in util/Makefile" - + else + cat >>confdefs.h <<_ACEOF --- configure.ac -+++ configure.ac 2004-04-21 12:37:32.000000000 +0200 -@@ -209,6 +209,24 @@ AM_CONDITIONAL(INSTALL_WARNINGS, - AM_GNU_GETTEXT_VERSION(0.14.1) - AM_GNU_GETTEXT() ++++ configure.ac 2008-03-10 12:59:04.926680264 +0100 +@@ -221,6 +221,24 @@ AC_CONFIG_FILES([util/defs]) + AC_CHECK_PROGS([HEVEA], [hevea], []) + AC_CHECK_PROGS([TEX], [tex], []) +# +# Check for zlib and libbz2 libraries to use this together @@ -694,31 +694,49 @@ Makefile doc/Makefile --- util/install-info.c -+++ util/install-info.c 2004-04-21 12:49:50.000000000 +0200 ++++ util/install-info.c 2008-03-10 14:52:25.546733145 +0000 @@ -20,6 +20,9 @@ - #include "system.h" #include + #include +#ifdef HAVE_ZIO +# include +#endif static char *progname = "install-info"; -@@ -545,16 +548,28 @@ open_possibly_compressed_file (char *fil - opened_filename = &local_opened_filename; +@@ -576,15 +579,47 @@ *opened_filename = filename; -+#ifdef HAVE_ZIO -+ f = fzopen (*opened_filename, FOPEN_RBIN); -+#else f = fopen (*opened_filename, FOPEN_RBIN); ++#ifdef HAVE_ZIO ++ if (!compression_program) ++ compression_program = &local_compression_program; ++ *compression_program = NULL; ++ if (f) ++ { ++ nread = fread (data, sizeof (data), 1, f); ++ if (nread == 1) ++ { ++ if (data[0] == '\x1f' && data[1] == '\x8b') ++ *compression_program = "g"; ++ else if(data[0] == '\x1f' && data[1] == '\x9d') ++ *compression_program = "Z"; ++ else if(data[0] == '\x1f' && data[1] == '\x9e') ++ *compression_program = "z"; ++ else if(data[0] == 'B' && data[1] == 'Z' && data[2] == 'h') ++ *compression_program = "b"; ++ } ++ fclose(f); ++ f = fzopen (*opened_filename, FOPEN_RBIN); ++ } +#endif if (!f) { *opened_filename = concat (filename, ".gz", ""); +#ifdef HAVE_ZIO + f = fzopen (*opened_filename, FOPEN_RBIN); ++ *compression_program = "g"; +#else f = fopen (*opened_filename, FOPEN_RBIN); +#endif @@ -730,33 +748,12 @@ + f = fzopen (*opened_filename, FOPEN_RBIN); +#else f = fopen (*opened_filename, FOPEN_RBIN); ++ *compression_program = "b"; +#endif } #ifdef __MSDOS__ -@@ -562,13 +577,21 @@ open_possibly_compressed_file (char *fil - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -+#ifdef HAVE_ZIO -+ f = fzopen (*opened_filename, FOPEN_RBIN); -+#else - f = fopen (*opened_filename, FOPEN_RBIN); -+#endif - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -+#ifdef HAVE_ZIO -+ f = fzopen (*opened_filename, FOPEN_RBIN); -+#else - f = fopen (*opened_filename, FOPEN_RBIN); -+#endif - } - #endif - if (!f) -@@ -580,7 +603,11 @@ open_possibly_compressed_file (char *fil +@@ -610,7 +645,11 @@ /* And try opening it again. */ free (*opened_filename); *opened_filename = filename; @@ -768,7 +765,7 @@ if (!f) pfatal_with_name (filename); } -@@ -588,7 +615,7 @@ open_possibly_compressed_file (char *fil +@@ -618,7 +657,7 @@ pfatal_with_name (filename); } } @@ -777,27 +774,36 @@ /* Read first few bytes of file rather than relying on the filename. If the file is shorter than this it can't be usable anyway. */ nread = fread (data, sizeof (data), 1, f); -@@ -649,7 +676,14 @@ open_possibly_compressed_file (char *fil +@@ -679,7 +718,7 @@ #endif *is_pipe = 0; } -+#else /* !HAVE_ZIO */ -+ -+ if (!compression_program) -+ compression_program = &local_compression_program; -+ -+ compression_program = NULL; - +- +#endif /* !HAVE_ZIO */ return f; } -@@ -1450,7 +1484,7 @@ There is NO WARRANTY, to the extent perm - warning (_("no entries found for `%s'; nothing deleted"), infile, 0); +@@ -752,11 +791,23 @@ + int i; + FILE *output; - output_dirfile (opened_dirfilename, dir_nlines, dir_lines, n_entries_to_add, -- entries_to_add, input_sections, compression_program); -+ entries_to_add, input_sections, NULL); ++#ifndef HAVE_ZIO + if (compression_program) + { + char *command = concat (compression_program, ">", dirfile); + output = popen (command, "w"); + } ++#else ++ if (compression_program) ++ { ++ if (*compression_program == 'g' || *compression_program == 'z') ++ output = fzopen (dirfile, "wg"); ++ if (*compression_program == 'b') ++ output = fzopen (dirfile, "wb"); ++ if (*compression_program == 'Z') ++ output = fzopen (dirfile, "wZ"); ++ } ++#endif + else + output = fopen (dirfile, "w"); - xexit (0); - return 0; /* Avoid bogus warnings. */ diff --git a/texinfo-4.11.dif b/texinfo-4.11.dif new file mode 100644 index 0000000..dc83417 --- /dev/null +++ b/texinfo-4.11.dif @@ -0,0 +1,88 @@ +--- .pkgextract ++++ .pkgextract 2004-04-16 16:07:40.000000000 +0200 +@@ -0,0 +1,2 @@ ++patch -p0 -b --suffix=.zlib < ../texinfo-4.11-zlib.patch ++patch -p0 -b --suffix=.echo < ../texinfo-4.8-echo.patch +--- system.h ++++ system.h 2008-03-10 16:05:19.737766945 +0100 +@@ -39,6 +39,7 @@ extern char *substring (const char *, co + #include + #include + #include ++#include + + /* Use POSIX headers. If they are not available, we use the substitute + provided by gnulib. */ +--- info/filesys.h ++++ info/filesys.h 2008-03-10 13:56:42.100908000 +0100 +@@ -78,7 +78,7 @@ extern int is_dir_name (char *filename); + + /* The default value of INFOPATH. */ + #if !defined (DEFAULT_INFOPATH) +-# define DEFAULT_INFOPATH ".:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info" ++# define DEFAULT_INFOPATH "/usr/local/share/info:/usr/local/info:/usr/local/lib/info:/usr/share/info:/usr/info:/usr/lib/info:/opt/gnu/info:/usr/share/xemacs/info:." + #endif /* !DEFAULT_INFOPATH */ + + #if !defined (S_ISREG) && defined (S_IFREG) +--- util/texi2dvi ++++ util/texi2dvi 2008-03-10 13:58:32.230984000 +0100 +@@ -280,25 +280,7 @@ absolute () + # Return true if PROG is somewhere in PATH, else false. + findprog () + { +- local saveIFS="$IFS" +- IFS=$path_sep # break path components at the path separator +- for dir in $PATH; do +- IFS=$saveIFS +- # The basic test for an executable is `test -f $f && test -x $f'. +- # (`test -x' is not enough, because it can also be true for directories.) +- # We have to try this both for $1 and $1.exe. +- # +- # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin, +- # also `test -f' has this enhancement, bot not on DJGPP. (Both are +- # design decisions, so there is little chance to make them consistent.) +- # Thusly, it seems to be difficult to make use of these enhancements. +- # +- if { test -f "$dir/$1" && test -x "$dir/$1"; } || +- { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then +- return 0 +- fi +- done +- return 1 ++ type -p $1 > /dev/null 2>&1 + } + + # report LINE1 LINE2... +@@ -759,6 +741,11 @@ run_tex () + *) error 1 "$0: $out_lang not supported for $in_lang";; + esac + ++ if ! type -p $tex > /dev/null 2>&1 ; then ++ echo "${0##*/}: requires $tex, please install texlive and texlive-latex" 1>&2 ++ exit 1 ++ fi ++ + # Beware of aux files in subdirectories that require the + # subdirectory to exist. + case $in_lang:$tidy in +@@ -858,6 +845,11 @@ run_bibtex () + texinfo) return;; + esac + ++ if ! type -p $bibtex > /dev/null 2>&1 ; then ++ echo "${0##*/}: requires $bibtex, please install texlive and texlive-latex" 1>&2 ++ exit 1 ++ fi ++ + # "Citation undefined" is for LaTeX, "Undefined citation" for btxmac.tex. + # The no .aux && \bibdata test is also for btxmac, in case it was the + # first run of a bibtex-using document. Otherwise, it's possible that +@@ -1612,7 +1604,7 @@ for command_line_filename in ${1+"$@"}; + sed 's,/,!,g'` + esac + # Remove it at exit if clean mode. +- trap "cleanup" 0 1 2 15 ++ trap "cleanup" EXIT SIGHUP SIGINT SIGQUIT SIGBUS SIGPIPE SIGTERM + + ensure_dir "$build_dir" "$t2ddir" + diff --git a/texinfo-4.11.tar.bz2 b/texinfo-4.11.tar.bz2 new file mode 100644 index 0000000..3542713 --- /dev/null +++ b/texinfo-4.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61033d48778ac7a6c80ac7cee66ca962fc4a1565fad13759618916f7f292f5f7 +size 1659601 diff --git a/texinfo-4.8-sec.patch b/texinfo-4.8-sec.patch deleted file mode 100644 index e2194b5..0000000 --- a/texinfo-4.8-sec.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- util/texindex.c -+++ util/texindex.c 2006-11-10 14:05:27.000000000 +0100 -@@ -837,7 +837,7 @@ readline (struct linebuffer *linebuffer, - { - buffer = (char *) xrealloc (buffer, linebuffer->size *= 2); - p += buffer - linebuffer->buffer; -- end += buffer - linebuffer->buffer; -+ end = buffer + linebuffer->size; - linebuffer->buffer = buffer; - } - if (c < 0 || c == '\n') diff --git a/texinfo-4.8-tempfile.patch b/texinfo-4.8-tempfile.patch deleted file mode 100644 index d438de2..0000000 --- a/texinfo-4.8-tempfile.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- util/texindex.c -+++ util/texindex.c 2005-10-06 15:47:13.000000000 +0200 -@@ -20,6 +20,7 @@ - - #include "system.h" - #include -+#include - - static char *program_name = "texindex"; - -@@ -37,8 +38,6 @@ - #define memset(ptr, ignore, count) bzero (ptr, count) - #endif - --char *mktemp (char *); -- - #if !defined (SEEK_SET) - # define SEEK_SET 0 - # define SEEK_CUR 1 -@@ -99,6 +98,10 @@ - /* Directory to use for temporary files. On Unix, it ends with a slash. */ - char *tempdir; - -+/* The base directory for the temporary files located in tempdir */ -+ -+static char *tempbase = NULL; -+ - /* Number of last temporary file. */ - int tempcount; - -@@ -146,6 +149,7 @@ - void *xmalloc (), *xrealloc (); - char *concat (char *s1, char *s2); - void flush_tempfiles (int to_count); -+void flush_tempfiles_atexit (); - - #define MAX_IN_CORE_SORT 500000 - -@@ -321,6 +325,7 @@ - tempdir = concat (tempdir, "/"); - - keep_tempfiles = 0; -+ atexit(flush_tempfiles_atexit); - - /* Allocate ARGC input files, which must be enough. */ - -@@ -384,25 +389,25 @@ - usage (1); - } - -+ - /* Return a name for temporary file COUNT. */ - - static char * - maketempname (int count) - { -- static char *tempbase = NULL; -- char tempsuffix[10]; -+ char tempsuffix[20]; - - if (!tempbase) - { -- int fd; -- tempbase = concat (tempdir, "txidxXXXXXX"); -+ char *td; -+ tempbase = concat (tempdir, "txdirXXXXXX"); - -- fd = mkstemp (tempbase); -- if (fd == -1) -+ td = mkdtemp (tempbase); -+ if (td == (char*)0) - pfatal_with_name (tempbase); - } - -- sprintf (tempsuffix, ".%d", count); -+ sprintf (tempsuffix, "/txidx.%d", count); - return concat (tempbase, tempsuffix); - } - -@@ -418,6 +423,13 @@ - unlink (maketempname (++last_deleted_tempcount)); - } - -+void -+flush_tempfiles_atexit (void) -+{ -+ flush_tempfiles (tempcount); -+ if (tempbase && !keep_tempfiles) -+ (void)rmdir(tempbase); -+} - - /* Compare LINE1 and LINE2 according to the specified set of keyfields. */ - diff --git a/texinfo-4.8-xml.patch b/texinfo-4.8-xml.patch deleted file mode 100644 index 4a13879..0000000 --- a/texinfo-4.8-xml.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- makeinfo/xml.c -+++ makeinfo/xml.c 2007-02-19 14:53:37.000000000 +0100 -@@ -30,6 +30,8 @@ - - #include "xml.h" - -+#include -+ - /* Options */ - int xml_index_divisions = 1; - -@@ -657,6 +659,7 @@ static int element_stack_index = 0; - static int - xml_current_element (void) - { -+ assert (element_stack_index > 0); - return element_stack[element_stack_index-1]; - } - -@@ -675,9 +678,10 @@ xml_pop_current_element (void) - { - element_stack_index--; - if (element_stack_index < 0) -- printf ("*** stack underflow (%d - %d) ***\n", -- element_stack_index, -- xml_current_element()); -+ { -+ printf ("*** stack underflow (index %d) ***\n", element_stack_index); -+ element_stack_index = 0; -+ } - } - - int -@@ -712,7 +716,8 @@ xml_start_para (void) - || !xml_element_list[xml_current_element()].contains_para) - return; - -- while (output_paragraph[output_paragraph_offset-1] == '\n') -+ while (output_paragraph_offset > 0 -+ && output_paragraph[output_paragraph_offset-1] == '\n') - output_paragraph_offset--; - xml_indent (); - -@@ -730,7 +735,8 @@ xml_end_para (void) - if (!xml_in_para || xml_in_footnote) - return; - -- while (cr_or_whitespace(output_paragraph[output_paragraph_offset-1])) -+ while (output_paragraph_offset > 0 -+ && cr_or_whitespace(output_paragraph[output_paragraph_offset-1])) - output_paragraph_offset--; - - insert_string (""); -@@ -789,7 +795,7 @@ xml_insert_element_with_attribute (elt, - /* Look at the replace_elements table to see if we have to change the element */ - if (xml_sort_index) - return; -- if (docbook) -+ if (docbook && element_stack_index > 0) - { - replace_element *element_list = replace_elements; - while (element_list->element_to_replace >= 0) -@@ -905,13 +911,15 @@ xml_insert_element_with_attribute (elt, - /* Eat one newline before and the like. */ - if (!docbook && arg == END - && (xml_element_list[elt].keep_space || elt == GROUP) -+ && output_paragraph_offset > 0 - && output_paragraph[output_paragraph_offset-1] == '\n') - output_paragraph_offset--; - - /* And eat whitespace before in @multitables. */ - if (arg == END && elt == ENTRY) -- while (cr_or_whitespace(output_paragraph[output_paragraph_offset-1])) -- output_paragraph_offset--; -+ while (output_paragraph_offset > 0 && -+ cr_or_whitespace(output_paragraph[output_paragraph_offset-1])) -+ output_paragraph_offset--; - - /* Indent elements that can contain . */ - if (arg == END && !xml_in_para && !xml_keep_space -@@ -1214,7 +1222,8 @@ xml_add_char (int character) - xml_just_after_element = 0; - } - -- if (xml_element_list[xml_current_element()].contains_para -+ if (element_stack_index > 0 -+ && xml_element_list[xml_current_element()].contains_para - && !xml_in_para && !only_macro_expansion && !xml_no_para - && !cr_or_whitespace (character) && !in_fixed_width_font) - xml_start_para (); diff --git a/texinfo-4.9.dif b/texinfo-4.9.dif index 97fc6ac..bc8427f 100644 --- a/texinfo-4.9.dif +++ b/texinfo-4.9.dif @@ -1,11 +1,8 @@ --- .pkgextract +++ .pkgextract 2004-04-16 16:07:40.000000000 +0200 -@@ -0,0 +1,5 @@ -+patch -p0 -b --suffix=.zlib < ../texinfo-4.9-zlib.patch -+patch -p0 -b --suffix=.tmpf < ../texinfo-4.8-tempfile.patch +@@ -0,0 +1,2 @@ ++patch -p0 -b --suffix=.zlib < ../texinfo-4.11-zlib.patch +patch -p0 -b --suffix=.echo < ../texinfo-4.8-echo.patch -+patch -p0 -b --suffix=.sec < ../texinfo-4.8-sec.patch -+patch -p0 -b --suffix=.xml < ../texinfo-4.8-xml.patch --- info/filesys.h +++ info/filesys.h 2004-04-16 16:07:40.000000000 +0200 @@ -78,7 +78,7 @@ extern int is_dir_name (char *filename); diff --git a/texinfo-4.9.tar.bz2 b/texinfo-4.9.tar.bz2 deleted file mode 100644 index 00f882a..0000000 --- a/texinfo-4.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e719982293a2dd55af7cf720407d3660a01da3fd791d03a47408d502084cf840 -size 1524181 diff --git a/texinfo.changes b/texinfo.changes index 2b9f24b..a613e75 100644 --- a/texinfo.changes +++ b/texinfo.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Mon Mar 10 13:33:18 CET 2008 - werner@suse.de + +- Update to texinfo version 4.11 (4.10 was omitted) + * Language: + . @documentlanguage now supports an optional country code + specification after the language code, a la gettext. + . new command @allowcodebreaks controls breaks at _ and - within @code. + . new command @frenchspacing controls spacing after sentences. + . new command @fonttextsize allows changing body text font size to 10pt. + . new command @textdegree{} produces the normal degrees symbol. + . new command @thischapternum can be used in TeX headers/footers. + . new commands for quotes: @quotedblleft @quotedblright + @quoteleft @quoteright @quotedblbase @quotesinglbase + @guillemetleft @guillemetright @guilsinglleft @guilsinglright. + . new option @set txicodequoteundirected produces an undirected quote + in code and example output, instead of the regular right quote. + . new option @set txicodequotebacktick produces a grave accent in + code and example output, instead of the regular left quote. + * makeinfo: + . The @documentlanguage locale is used to translate various document strings. + . --enable-encoding is now the default, meaning Info and plain text + output use 8-bit characters given a supported @documentencoding. + . new option --css-ref=URL for creating a stylesheet in HTML output. + . new option --transliterate-file-names to use a reduction-to-ASCII + algorithm for split HTML file names, useful for non-Latin-based languages. + . @enddots{} outputs three dots instead of four, for consistency with + texinfo.tex. + . the Local Variables coding: setting written by --enable-encoding now + comes at the very end, after the tags table, so that Emacs can find + it in more cases. + . @allow-recursion (never documented) is deprecated and produces a warning. + . @quote-args (never documented) is now the default behavior. + . centering and such take account of character widths. + . the --reference-limit option is now a no-op. + . improvements to XML and Docbook output and the DTD. + * texinfo.tex: + . @thissection can now be used in custom headings, and @thischapter + works reliably even without @set chapternewpage. Custom headings + have additional flexibility as well. + * texi2dvi: + . pdftexi2dvi is a new wrapper to `texi2dvi --pdf', equal to texi2pdf, + for the sake of AUC-TeX which prepends `pdf' to the compilation + command when requested to produce PDF. + * info: + . look for info files in the current directory first, by default. + . when calling man, use -a if no explicit section is found. + . avoid showing the top(1) man page for nonexistent info files. + * install-info: + . new options --section-regex, --remove-exactly, --debug, --test. + * Distribution: + . autoconf 2.60, automake 1.10, gettext 0.16.1. + . gettext support now [external]. + . new translations: hu (Hungarian), rw (Kinyarwandan), vi (Vietnamese). + . most common sources imported from gnulib. + ------------------------------------------------------------------- Wed Jul 11 13:13:29 CEST 2007 - werner@suse.de diff --git a/texinfo.spec b/texinfo.spec index f160079..86ebe96 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,7 +1,7 @@ # -# spec file for package texinfo (Version 4.9) +# spec file for package texinfo (Version 4.11) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,31 +10,29 @@ # norootforbuild + Name: texinfo -BuildRequires: libbz2-devel libzio-devel ncurses-devel zlib-devel -License: GPL v2 or later +BuildRequires: libbz2-devel libzio-devel ncurses-devel perl-gettext zlib-devel +License: GPL v2 or later; GPL v3 or later Group: Productivity/Publishing/Texinfo -Autoreqprov: on -Version: 4.9 +AutoReqProv: on +Version: 4.11 Release: 1 Summary: Tools Needed to Create Documentation from Texinfo Sources -URL: http://www.texinfo.org +Url: http://www.texinfo.org PreReq: %{install_info_prereq} Source: ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.bz2 -# URL: http://savannah.nongnu.org/projects/texi2html/ -Source1: texi2html-1.78.tar.bz2 -Source2: texi2roff-2.0.tar.bz2 -Source3: info-dir +Source1: http://download.savannah.nongnu.org/releases/texi2html/texi2html-1.78.tar.bz2 +Source2: http://texinfo.org/texi2roff/texi2roff-2.0.tar.bz2 +Source3: http://ftp.gnu.org/gnu/help2man/help2man-1.36.4.tar.bz2 +Source10: info-dir Patch: texinfo-%{version}.dif Patch1: texi2html-1.78.dif Patch2: texi2roff-2.0.dif Patch3: texi2roff.patch.bz2 Patch4: texinfo-%{version}-zlib.patch -Patch5: texinfo-4.8-tempfile.patch -Patch6: texinfo-4.8-echo.patch -Patch7: texi2roff-2.0-gcc4.patch -Patch8: texinfo-4.8-sec.patch -Patch9: texinfo-4.8-xml.patch +Patch5: texinfo-4.8-echo.patch +Patch6: texi2roff-2.0-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,31 +92,44 @@ Authors: %prep rm -rf texi2html-1.78 texi2roff-2.0 -%setup -b 1 -b 2 +%setup -b 1 -b 2 -b 3 %patch4 -p0 -b .zlib -%patch5 -p0 -b .tempfile -%patch6 -p0 -b .echo -%patch8 -p0 -b .sec -%patch9 -p0 -b .xml -%patch +%patch5 -p0 -b .echo +%patch0 -p0 # nb is already there and more recent rm -fv po/no.* -cd ../texi2html-1.78 -%patch -P 1 -cd ../texi2roff-2.0 -%patch -P 3 -p 0 -b .Bader -%patch -P 2 -%patch7 -p1 +pushd ../texi2html-* +%patch1 -p0 +popd +pushd ../texi2roff-* +%patch3 -p0 -b .Bader +%patch2 -p0 +%patch6 -p1 +popd +pushd ../help2man-* +popd %build HOST=%{_target_cpu}-suse-linux - CFLAGS="$RPM_OPT_FLAGS -pipe" + CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -pipe" LDFLAGS="" CC=gcc export CFLAGS LDFLAGS CC +pushd ../help2man-* ./configure --build=$HOST \ - --prefix=/usr \ + --prefix=%{_prefix} \ --mandir=%{_mandir} \ + --datadir=%{_datadir} \ + --infodir=%{_infodir} \ + --enable-nls + make + PATH=${PWD}:${PATH} + export PATH +popd + ./configure --build=$HOST \ + --prefix=%{_prefix} \ + --mandir=%{_mandir} \ + --datadir=%{_datadir} \ --infodir=%{_infodir} \ --without-included-gettext \ --with-catgets \ @@ -126,48 +137,56 @@ cd ../texi2roff-2.0 make PATH=${PWD}/makeinfo:${PWD}/util:$PATH export PATH -cd ../texi2html-1.78 - CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -pipe" +pushd ../texi2html-* ./configure --build=$HOST \ - --prefix=/usr \ - --infodir=%{_infodir} \ + --prefix=%{_prefix} \ --mandir=%{_mandir} \ + --datadir=%{_datadir} \ + --infodir=%{_infodir} \ --without-included-gettext \ --with-catgets \ --enable-nls make -cd ../texi2roff-2.0 +popd +pushd ../texi2roff-* rm -f texi2roff make +popd %install -rm -rf ${RPM_BUILD_ROOT}/ - make DESTDIR=${RPM_BUILD_ROOT} \ +rm -rf %{buildroot}/ + make DESTDIR=%{buildroot} \ infodir=%{_infodir} \ htmldir=%{_defaultdocdir}/texi2html install - mkdir -p ${RPM_BUILD_ROOT}/sbin - mv ${RPM_BUILD_ROOT}/usr/bin/install-info ${RPM_BUILD_ROOT}/sbin/ - ln -sf ../../sbin/install-info ${RPM_BUILD_ROOT}/usr/bin/install-info - mkdir -p ${RPM_BUILD_ROOT}%{_infodir} - install -m 644 ${RPM_SOURCE_DIR}/info-dir ${RPM_BUILD_ROOT}%{_infodir}/dir -cd ../texi2html-1.78 - make DESTDIR=${RPM_BUILD_ROOT} \ + mkdir -p %{buildroot}/sbin + mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/ + ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info + mkdir -p %{buildroot}%{_infodir} + install -m 644 %{S:10} %{buildroot}%{_infodir}/dir +pushd ../texi2html-* + make DESTDIR=%{buildroot} \ infodir=%{_infodir} \ texinfohtmldir=%{_defaultdocdir}/texi2html install - install -m 644 README ${RPM_BUILD_ROOT}%{_defaultdocdir}/texi2html/ - install -m 644 NEWS ${RPM_BUILD_ROOT}%{_defaultdocdir}/texi2html/ - install -m 644 COPYING ${RPM_BUILD_ROOT}%{_defaultdocdir}/texi2html/ -cd ../texi2roff-2.0 + install -m 644 README %{buildroot}%{_defaultdocdir}/texi2html/ + install -m 644 NEWS %{buildroot}%{_defaultdocdir}/texi2html/ + install -m 644 COPYING %{buildroot}%{_defaultdocdir}/texi2html/ +popd +pushd ../texi2roff-* doc=%{_defaultdocdir}/texi2roff - install -m 755 texi2roff ${RPM_BUILD_ROOT}/usr/bin/ - install -m 755 texi2index ${RPM_BUILD_ROOT}/usr/bin/ - install -m 644 texi2roff.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/ - mkdir -p ${RPM_BUILD_ROOT}${doc} - install -m 644 Readme ${RPM_BUILD_ROOT}${doc} - install -m 644 copyright ${RPM_BUILD_ROOT}${doc} + install -m 755 texi2roff %{buildroot}%{_bindir}/ + install -m 755 texi2index %{buildroot}%{_bindir}/ + install -m 644 texi2roff.1 %{buildroot}%{_mandir}/man1/ + mkdir -p %{buildroot}${doc} + install -m 644 Readme %{buildroot}${doc} + install -m 644 copyright %{buildroot}${doc} +popd +#pushd ../help2man-* +# make DESTDIR=%{buildroot} install +#popd +%find_lang %name %{name}.lang %clean -test -n "$RPM_BUILD_ROOT" && rm -rf ${RPM_BUILD_ROOT} +test -n "%{buildroot}" && rm -rf %{buildroot} %post %install_info --info-dir=%{_infodir} %{_infodir}/texinfo.gz @@ -185,7 +204,7 @@ test -n "$RPM_BUILD_ROOT" && rm -rf ${RPM_BUILD_ROOT} %install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/info.info.gz -%files +%files -f %{name}.lang %defattr(-, root, root) %dir %{_defaultdocdir}/texi2html %dir %{_defaultdocdir}/texi2roff @@ -194,22 +213,22 @@ test -n "$RPM_BUILD_ROOT" && rm -rf ${RPM_BUILD_ROOT} %doc %{_defaultdocdir}/texi2html/* %doc %{_defaultdocdir}/texi2roff/* %doc %{_defaultdocdir}/texi2roff/* -/usr/bin/makeinfo -/usr/bin/texi* +%{_bindir}/makeinfo +%{_bindir}/pdftexi* +%{_bindir}/texi* %{_infodir}/texinfo*.gz %{_infodir}/texi2html*.gz %{_mandir}/man1/makeinfo.1.gz %{_mandir}/man1/texi*.1.gz %{_mandir}/man5/texinfo.5.gz -/usr/share/locale/*/*/texinfo.mo -/usr/share/texinfo -/usr/share/texi2html +%{_datadir}/texinfo +%{_datadir}/texi2html %files -n info %defattr(-,root,root) %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir /sbin/install-info -/usr/bin/install-info +%{_bindir}/install-info %{_bindir}/info %{_bindir}/infokey %{_infodir}/info.info* @@ -218,9 +237,71 @@ test -n "$RPM_BUILD_ROOT" && rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man1/infokey.1* %{_mandir}/man1/install-info.1* %{_mandir}/man5/info.5* +#%file -n help2man +#%defattr(-,root,root) +#%{_bindir}/help2man +#%{_bindir}/pdftexi2dvi +#%{_libdir}/hacklocaledir.so +#%{_datadir}/info/help2man.info.gz +#%{_datadir}/locale/*/LC_MESSAGES/help2man.mo +#%{_mandir}/man1/help2man.1.gz +#%{_mandir}/*/man1/help2man.1.gz %changelog -* Wed Jul 11 2007 - werner@suse.de +* Mon Mar 10 2008 werner@suse.de +- Update to texinfo version 4.11 (4.10 was omitted) + * Language: + . @documentlanguage now supports an optional country code + specification after the language code, a la gettext. + . new command @allowcodebreaks controls breaks at _ and - within @code. + . new command @frenchspacing controls spacing after sentences. + . new command @fonttextsize allows changing body text font size to 10pt. + . new command @textdegree{} produces the normal degrees symbol. + . new command @thischapternum can be used in TeX headers/footers. + . new commands for quotes: @quotedblleft @quotedblright + @quoteleft @quoteright @quotedblbase @quotesinglbase + @guillemetleft @guillemetright @guilsinglleft @guilsinglright. + . new option @set txicodequoteundirected produces an undirected quote + in code and example output, instead of the regular right quote. + . new option @set txicodequotebacktick produces a grave accent in + code and example output, instead of the regular left quote. + * makeinfo: + . The @documentlanguage locale is used to translate various document strings. + . --enable-encoding is now the default, meaning Info and plain text + output use 8-bit characters given a supported @documentencoding. + . new option --css-ref=URL for creating a stylesheet in HTML output. + . new option --transliterate-file-names to use a reduction-to-ASCII + algorithm for split HTML file names, useful for non-Latin-based languages. + . @enddots{} outputs three dots instead of four, for consistency with + texinfo.tex. + . the Local Variables coding: setting written by --enable-encoding now + comes at the very end, after the tags table, so that Emacs can find + it in more cases. + . @allow-recursion (never documented) is deprecated and produces a warning. + . @quote-args (never documented) is now the default behavior. + . centering and such take account of character widths. + . the --reference-limit option is now a no-op. + . improvements to XML and Docbook output and the DTD. + * texinfo.tex: + . @thissection can now be used in custom headings, and @thischapter + works reliably even without @set chapternewpage. Custom headings + have additional flexibility as well. + * texi2dvi: + . pdftexi2dvi is a new wrapper to `texi2dvi --pdf', equal to texi2pdf, + for the sake of AUC-TeX which prepends `pdf' to the compilation + command when requested to produce PDF. + * info: + . look for info files in the current directory first, by default. + . when calling man, use -a if no explicit section is found. + . avoid showing the top(1) man page for nonexistent info files. + * install-info: + . new options --section-regex, --remove-exactly, --debug, --test. + * Distribution: + . autoconf 2.60, automake 1.10, gettext 0.16.1. + . gettext support now [external]. + . new translations: hu (Hungarian), rw (Kinyarwandan), vi (Vietnamese). + . most common sources imported from gnulib. +* Wed Jul 11 2007 werner@suse.de - Update to texinfo version 4.9 * GPLv3. * texi2dvi: @@ -302,145 +383,145 @@ test -n "$RPM_BUILD_ROOT" && rm -rf ${RPM_BUILD_ROOT} * caching of html generated by latex2html reenabled. * when not split and no section navigation is output, the about page and navigation direction are not output for all the elements. -* Mon Mar 26 2007 - rguenther@suse.de +* Mon Mar 26 2007 rguenther@suse.de - Add libbz2-devel, ncurses-devel and zlib-devel BuildRequires - Exchange libzio for libzio-devel BuildRequires -* Mon Feb 19 2007 - werner@suse.de +* Mon Feb 19 2007 werner@suse.de - Avoid array subscript below array bounds (bug #246740) -* Fri Nov 10 2006 - werner@suse.de +* Fri Nov 10 2006 werner@suse.de - Fix buffer overflow in texi2dvi (bug #214920) -* Mon Jul 24 2006 - adrian@suse.de +* Mon Jul 24 2006 adrian@suse.de - add libzio as PreReq for info -* Fri Jun 16 2006 - werner@suse.de +* Fri Jun 16 2006 werner@suse.de - Re-enable texi2pdf because now tetex does not install this -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Dec 19 2005 - werner@suse.de +* Mon Dec 19 2005 werner@suse.de - Add missing sym link to file list -* Thu Oct 06 2005 - werner@suse.de +* Thu Oct 06 2005 werner@suse.de - Use directory for the base of temporary index files (bug #120577) -* Thu Mar 24 2005 - uli@suse.de +* Thu Mar 24 2005 uli@suse.de - fixed to build with GCC4 -* Thu Feb 10 2005 - werner@suse.de +* Thu Feb 10 2005 werner@suse.de - Update to next bug fix release 1.76 of texi2html -* Tue Feb 01 2005 - werner@suse.de +* Tue Feb 01 2005 werner@suse.de - Update to bug fix release 1.74 of texi2html -* Thu Jan 27 2005 - werner@suse.de +* Thu Jan 27 2005 werner@suse.de - Fix texi2html to not loop around on broken texi files - Remove texi2pdf from texinfo file list due already part of tetex -* Wed Jan 26 2005 - schwab@suse.de +* Wed Jan 26 2005 schwab@suse.de - Reenable strict aliasing. -* Tue Jan 25 2005 - werner@suse.de +* Tue Jan 25 2005 werner@suse.de - Move texi2html version to 1.72 - Update texinfo version to 4.8 -* Tue Oct 19 2004 - ro@suse.de +* Tue Oct 19 2004 ro@suse.de - drop no locale support, nb is already there -* Mon Aug 09 2004 - werner@suse.de +* Mon Aug 09 2004 werner@suse.de - Info: check remaining buffer size before printing into echo area -* Fri Jul 02 2004 - mfabian@suse.de +* Fri Jul 02 2004 mfabian@suse.de - apply makeinfo.patch received from Karl Berry fixing the problem that makeinfo 4.7 could not process groff.texinfo anymore. See http://lists.gnu.org/archive/html/bug-texinfo/2004-04/msg00026.html http://article.gmane.org/gmane.comp.tex.texinfo.bugs/2019/ -* Wed Apr 21 2004 - werner@suse.de +* Wed Apr 21 2004 werner@suse.de - Use libzio together with zlib and libbz2 to support bz2 info files to avoids pipe()/fork()/execve() calls in install-info. -* Mon Apr 19 2004 - werner@suse.de +* Mon Apr 19 2004 werner@suse.de - Be sure that texi2html find all required tools -* Fri Apr 16 2004 - werner@suse.de +* Fri Apr 16 2004 werner@suse.de - Update to texinfo 4.7 - Use -fno-strict-aliasing -* Sun Mar 14 2004 - schwab@suse.de +* Sun Mar 14 2004 schwab@suse.de - Fix uses of snprintf and gzFile. -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - build as user -* Wed Dec 10 2003 - werner@suse.de +* Wed Dec 10 2003 werner@suse.de - Update to texinfo 4.6 -* Wed May 21 2003 - ro@suse.de +* Wed May 21 2003 ro@suse.de - fix filelist: package files in /usr/share/texinfo -* Thu Apr 24 2003 - ro@suse.de +* Thu Apr 24 2003 ro@suse.de - fix install_info --delete call and move from preun to postun -* Sun Mar 09 2003 - kukuk@suse.de +* Mon Mar 10 2003 kukuk@suse.de - Add zlib to info PreRequires [Bug #24954] -* Tue Feb 11 2003 - kukuk@suse.de +* Tue Feb 11 2003 kukuk@suse.de - Branch off info sub package - Add /usr/share/info/dir -* Sat Feb 08 2003 - kukuk@suse.de +* Sat Feb 08 2003 kukuk@suse.de - Remove PreRequire for gzip, link against zlib instead (patched based on version from RH) -* Sat Feb 08 2003 - ro@suse.de +* Sat Feb 08 2003 ro@suse.de - fixed pre/post install scripts -* Fri Feb 07 2003 - ro@suse.de +* Fri Feb 07 2003 ro@suse.de - removed self-prereq again -* Thu Feb 06 2003 - aj@suse.de +* Thu Feb 06 2003 aj@suse.de - Use install_info. - Update to texinfo 4.5. -* Wed Jan 22 2003 - werner@suse.de +* Wed Jan 22 2003 werner@suse.de - Request gzip before installing (bug #22992) -* Fri Aug 30 2002 - werner@suse.de +* Fri Aug 30 2002 werner@suse.de - Add a warning on missed programs and say what todo (bug #18642) -* Mon Jun 17 2002 - schwab@suse.de +* Mon Jun 17 2002 schwab@suse.de - Update to texinfo 4.2. -* Thu Mar 07 2002 - schwab@suse.de +* Thu Mar 07 2002 schwab@suse.de - Update to texinfo 4.1. -* Wed Feb 13 2002 - schwab@suse.de +* Wed Feb 13 2002 schwab@suse.de - Fix verbose message of texi2dvi. -* Thu Jan 24 2002 - okir@suse.de +* Thu Jan 24 2002 okir@suse.de - fixed tempfile races in texindex (moved all tempfiles into a subdirectory of /tmp). -* Wed Jan 16 2002 - schwab@suse.de +* Wed Jan 16 2002 schwab@suse.de - Fix bad free in "makeinfo --html". -* Tue Jun 12 2001 - schwab@suse.de +* Tue Jun 12 2001 schwab@suse.de - Fix directive inside macro call. -* Thu Apr 12 2001 - werner@suse.de +* Thu Apr 12 2001 werner@suse.de - Use CVS snapshot of texi2html which works on glibc texinfo code -* Thu Apr 12 2001 - ro@suse.de +* Thu Apr 12 2001 ro@suse.de - fixed glossary for texi2html -* Wed Apr 11 2001 - werner@suse.de +* Wed Apr 11 2001 werner@suse.de - Update of texi2html and texi2roff -* Thu Sep 28 2000 - werner@suse.de +* Thu Sep 28 2000 werner@suse.de - Move /usr/bin/install-info to /sbin/install-info and set backward compatibility symlink. -* Wed May 31 2000 - werner@suse.de +* Wed May 31 2000 werner@suse.de - use rpm macros for common paths -* Mon Feb 28 2000 - werner@suse.de +* Mon Feb 28 2000 werner@suse.de - Fix segmentation fault (close bug #1911) -* Thu Feb 03 2000 - werner@suse.de +* Thu Feb 03 2000 werner@suse.de - Fixed de.po -* Wed Feb 02 2000 - werner@suse.de +* Wed Feb 02 2000 werner@suse.de - Remove Makefile.Linux - /usr/man -> /usr/share/man - /usr/info -> /usr/share/info (man pages and main for info program) - Install info pages of texinfo -* Wed Dec 01 1999 - werner@suse.de +* Wed Dec 01 1999 werner@suse.de - small changes -* Mon Nov 29 1999 - ke@suse.de +* Mon Nov 29 1999 ke@suse.de - update: version 4.0 (#600). - use BuildRoot. - install COPYRIGHT, etc. - don't disable NLS. -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Mon Jan 11 1999 - ro@suse.de +* Mon Jan 11 1999 ro@suse.de - info/terminal.c : TIOCGETC and TIOCGLTC are defined on alpha, but we can't access tchars and ltchars strutures, so undef both use tcgetattr and cfgetospeed to determine output speed -* Fri Jul 17 1998 - werner@suse.de +* Fri Jul 17 1998 werner@suse.de - check exit satus of mkdir for temp directories -* Tue Oct 14 1997 - ro@suse.de +* Tue Oct 14 1997 ro@suse.de - update to 3.12 - ready for autobuild -* Fri Oct 10 1997 - florian@suse.de +* Fri Oct 10 1997 florian@suse.de - update to texinfo 3.11 -* Sun Jun 22 1997 - florian@suse.de +* Sun Jun 22 1997 florian@suse.de - add debian-changes to support ANSI-cursor movements - add texi2html 1.51 - add texi2roff 2.0 -* Sun Apr 13 1997 - florian@suse.de +* Mon Apr 14 1997 florian@suse.de - cosmetic changes, just done in preparation for glibc -* Thu Jan 02 1997 - florian@suse.de +* Thu Jan 02 1997 florian@suse.de - Update auf neue Version 3.9.