diff --git a/texinfo-5.2.tar.gz b/texinfo-5.2.tar.gz deleted file mode 100644 index b981a29..0000000 --- a/texinfo-5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74 -size 7672236 diff --git a/texinfo-5.2.tar.gz.sig b/texinfo-5.2.tar.gz.sig deleted file mode 100644 index c2203b2..0000000 --- a/texinfo-5.2.tar.gz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQEcBAABAgAGBQJSRMBnAAoJEAcWdIow0VWtJgMH/2t1b0tae6D12a5Ok9A0VUph -GIFIiXdjzE3Rqqx6RgTrXGYrbhCdkgtA8iKNziPz10a341h/Inn0vLKNpdk2jPO9 -PnTwwp45U7pyau9XQq05RHPU9NgNtjmZfRaCgtR9zZB1WF933PTTb38e3GvAvAou -oFSn3TI4KuRhuO63bxrscGqiKaACARFis/HYv0z7iFJlQuwVbs1JRKb5qSynDSLy -K08EEEkqBtmdLJJ8jQbuCn+cxDZi51cyA1/04WULpQL3BmBq/hSvYfLoDd9OITYT -Ox+fqHjh7HY0IV22OpRzzEg7GquTJvBhYKk+aXeEoam/LLatFVcoRbqO6rsyunk= -=R1Vd ------END PGP SIGNATURE----- diff --git a/texinfo-6.0.tar.gz b/texinfo-6.0.tar.gz new file mode 100644 index 0000000..f830ff2 --- /dev/null +++ b/texinfo-6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83d3183290f34e7f958d209d0b20022c6fe9e921eb6fe94c27d988827d4878d2 +size 8349669 diff --git a/texinfo-6.0.tar.gz.sig b/texinfo-6.0.tar.gz.sig new file mode 100644 index 0000000..fd55f30 --- /dev/null +++ b/texinfo-6.0.tar.gz.sig @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iF4EABEIAAYFAlWNWYkACgkQ3bxXnas3+6nUFwEAxIw7Bjs/JPDSJ83lKGw9Xau5 +abzxxGQgtO+DC5ql+LgA/37J6v+ILpZdzvvOOBidmKy3kUAjnqWKsZNGxSGhEI1I +=s1/q +-----END PGP SIGNATURE----- diff --git a/texinfo-zlib.patch b/texinfo-zlib.patch index a6538ef..bfe2968 100644 --- a/texinfo-zlib.patch +++ b/texinfo-zlib.patch @@ -1,8 +1,13 @@ -Index: texinfo-5.2/install-info/Makefile.in +Index: texinfo-6.0/install-info/Makefile.in =================================================================== ---- texinfo-5.2.orig/install-info/Makefile.in -+++ texinfo-5.2/install-info/Makefile.in -@@ -201,7 +201,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" +--- + texinfo-6.0/install-info/Makefile.in | 2 - + texinfo-6.0/install-info/install-info.c | 54 +++++++++++++++++++++++++++----- + 2 files changed, 48 insertions(+), 8 deletions(-) + +--- texinfo-6.0/install-info/Makefile.in ++++ texinfo-6.0/install-info/Makefile.in 2015-07-15 00:00:00.000000000 +0000 +@@ -241,7 +241,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) @@ -11,10 +16,8 @@ Index: texinfo-5.2/install-info/Makefile.in am__DEPENDENCIES_1 = ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ $(am__DEPENDENCIES_1) -Index: texinfo-5.2/install-info/install-info.c -=================================================================== ---- texinfo-5.2.orig/install-info/install-info.c -+++ texinfo-5.2/install-info/install-info.c +--- texinfo-6.0/install-info/install-info.c ++++ texinfo-6.0/install-info/install-info.c 2015-07-15 12:45:21.689530651 +0000 @@ -22,6 +22,7 @@ #include #include @@ -23,7 +26,7 @@ Index: texinfo-5.2/install-info/install-info.c #define TAB_WIDTH 8 -@@ -687,10 +688,31 @@ open_possibly_compressed_file (char *fil +@@ -701,34 +702,59 @@ open_possibly_compressed_file (char *fil *opened_filename = filename; f = fopen (*opened_filename, FOPEN_RBIN); @@ -56,7 +59,13 @@ Index: texinfo-5.2/install-info/install-info.c } if (!f) { -@@ -702,7 +724,8 @@ open_possibly_compressed_file (char *fil + free (*opened_filename); + *opened_filename = concat (filename, ".xz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = fzopen (*opened_filename, FOPEN_RBIN); ++ *compression_program = "x"; + } + if (!f) { free (*opened_filename); *opened_filename = concat (filename, ".bz2", ""); @@ -66,12 +75,44 @@ Index: texinfo-5.2/install-info/install-info.c } if (!f) { -@@ -739,7 +762,7 @@ open_possibly_compressed_file (char *fil - /* And try opening it again. */ - free (*opened_filename); - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = fzopen (*opened_filename, FOPEN_RBIN); - if (!f) - pfatal_with_name (filename); - } + free (*opened_filename); + *opened_filename = concat (filename, ".lz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = fzopen (*opened_filename, FOPEN_RBIN); ++ *compression_program = "l"; + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".lzma", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = fzopen (*opened_filename, FOPEN_RBIN); ++ *compression_program = "l"; + } + #ifdef __MSDOS__ + if (!f) +@@ -942,8 +968,22 @@ output_dirfile (char *dirfile, int dir_n + + if (compression_program) + { +- char *command = concat (compression_program, ">", dirfile); +- output = popen (command, "w"); ++ output = NULL; ++ 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"); ++ if (*compression_program == 'l') ++ output = fzopen (dirfile, "wl"); ++ if (*compression_program == 'x') ++ output = fzopen (dirfile, "wx"); ++ if (!output) ++ { ++ char *command = concat (compression_program, ">", dirfile); ++ output = popen (command, "w"); ++ } + } + else + output = fopen (dirfile, "w"); diff --git a/texinfo.changes b/texinfo.changes index 8fea3c4..53ff067 100644 --- a/texinfo.changes +++ b/texinfo.changes @@ -1,3 +1,85 @@ +------------------------------------------------------------------- +Wed Jul 15 11:13:20 UTC 2015 - werner@suse.de + +- The package texinfo now requires makeinfo of the same version + to make sure that the correct Texinfo.pm is installed +- libzio is able to handle lz(ma) and xz files as well + +------------------------------------------------------------------- +Sat Jul 11 10:14:57 UTC 2015 - mpluskal@suse.com + +- Update to 6.0 + * Language: + + new commands @sub and @sup, for textual subscripts and + superscripts. + + new command @U to insert a Unicode character by code point. + * texinfo.tex: + + @url/@uref output in PDF now the same as in DVI, showing the + url even if the second argument is given, not just as a link + target. TeX option \urefurlonlylinktrue gives previous + behavior, of invisible urls. + + PDF-only \linkcolor and \urlcolor specify colors (default + black). + * texi2any: + + customization variable TOP_NODE_UP_URL now replaces all (dir) + references; recommended setting for GNU packages is /manual/. + + new customization variable INDEX_SPECIAL_CHARS_WARNING to + complain when index entries contain a colon. + + Docbook output no longer uses for @r. + + -D'var val' on the command line works as intended again. + + --plaintext output can be split. + + a bit faster. + * info: + + invoking as `info foo bar' looks for bar as an index entry + in manual foo, if not found as a top-level menu item. + + invoking info with an absolute or explicitly relative file + name (./foo.info, /tmp/foo.info, etc.) just visits that file. + + separate `infokey' program has been removed - the .infokey + file is now read directly by Info. + + new option --init-file allows overriding ~/.infokey. + + new variable `highlight-searches' allows highlighting + results from a search + + support for mouse scrollwheel, controlled by `mouse' + variable. + + new variable `key_time' to control how long to wait for + byte sequences sent by special keys. + + new variable `hide-note-references' alters appearance of + displayed nodes + + new variable `infopath-no-defaults' allows omitting the + compile-time Info directory from the Info search path. + + support input of multibyte characters for searches in + a UTF-8 locale. + + if reading an Info file that is known to be in a different + character encoding to that of the user's environment, + convert its contents when displayed and substitute + missing characters + + new command M-x info-version. + + the M-x kill-node command has been removed. + + test suite at build time. + * texindex: + + completely new implementation as a literate program using + Texinfo and (portable) awk (called TexiWeb Jr.). + + the -o (--output) is not supported, unless we hear of + someone using it. + + duplicated sort keys with different display texts result + in one merged index entry, using the first display text. + + better sorting and parsing in unusual cases; most + notably, { and } characters can appear as initials. + * install-info: + + handle compressed input file names containing spaces. + + exit successfully if --remove is given and the dir file + does not exist. + + new option --defsection, to be used instead of + "Miscellaneous" when a section is not present in the Info + file. + * texi2dvi: + + look for the environment variable THUMBPDF_CMD instead of + THUMBPDF, since thumbpdf itself has used THUMBPDF for options + since 2000. + + remove --recode and --recode-from options, since they haven't + worked as intended for years, so evidently no one needs them. +- refresh texinfo-zlib.patch + ------------------------------------------------------------------- Sat May 16 06:20:05 UTC 2015 - schwab@linux-m68k.org diff --git a/texinfo.keyring b/texinfo.keyring index 75b44a9..0d19f73 100644 --- a/texinfo.keyring +++ b/texinfo.keyring @@ -1,43 +1,39 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2 -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 -hco7ullX6MshUhCX+21PKLEPtgs1HkI= -=sPVF +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 +=o42y -----END PGP PUBLIC KEY BLOCK----- diff --git a/texinfo.spec b/texinfo.spec index 1e1f404..e70654f 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,7 +1,7 @@ # # spec file for package texinfo # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: texinfo -Version: 5.2 +Version: 6.0 Release: 0 Summary: Tools Needed to Create Documentation from Texinfo Sources License: GPL-3.0+ @@ -43,7 +43,7 @@ BuildRequires: perl-gettext BuildRequires: perl-libintl-perl BuildRequires: perl-macros BuildRequires: zlib-devel -Requires: makeinfo +Requires: makeinfo = %{version} Requires: perl Requires(post): %install_info_prereq Requires(preun): %install_info_prereq @@ -177,10 +177,8 @@ rm -f %{buildroot}%{_infodir}/info.info* /sbin/install-info %{_bindir}/install-info %{_bindir}/info -%{_bindir}/infokey %{_infodir}/info-stnd.info* %{_mandir}/man1/info.1* -%{_mandir}/man1/infokey.1* %{_mandir}/man1/install-info.1* %{_mandir}/man5/info.5*