From 3edbe3ca2de852b0382f5f016872eb6c4f0ee9b9b1a5d4817bb9d77746a59e29 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 24 Jul 2017 10:28:56 +0000 Subject: [PATCH] 1 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texinfo?expand=0&rev=47 --- texinfo-6.3.tar.xz | 3 --- texinfo-6.3.tar.xz.sig | 7 ------ texinfo-6.4.tar.xz | 3 +++ texinfo-6.4.tar.xz.sig | 7 ++++++ texinfo-zlib.patch | 21 ++++++++---------- texinfo.changes | 47 +++++++++++++++++++++++++++++++++++++++ texinfo.spec | 50 +++++++++++++++++++----------------------- 7 files changed, 88 insertions(+), 50 deletions(-) delete mode 100644 texinfo-6.3.tar.xz delete mode 100644 texinfo-6.3.tar.xz.sig create mode 100644 texinfo-6.4.tar.xz create mode 100644 texinfo-6.4.tar.xz.sig diff --git a/texinfo-6.3.tar.xz b/texinfo-6.3.tar.xz deleted file mode 100644 index ab84890..0000000 --- a/texinfo-6.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:246cf3ffa54985118ec2eea2b8d0c71b92114efe6282c2ae90d65029db4cf93a -size 4468048 diff --git a/texinfo-6.3.tar.xz.sig b/texinfo-6.3.tar.xz.sig deleted file mode 100644 index 6e72b6e..0000000 --- a/texinfo-6.3.tar.xz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iF4EABEIAAYFAlfUbtEACgkQ3bxXnas3+6nd0AEAoEi1Bo+hlJXs2vdvbrfaPy+E -2utGZqXTQ888tM8CzdUBAJjtwVXjVtd+Nwl/Qh+Qb8E7L6FoiyFKJriddaPwfRzM -=0NEP ------END PGP SIGNATURE----- diff --git a/texinfo-6.4.tar.xz b/texinfo-6.4.tar.xz new file mode 100644 index 0000000..0ac0fb8 --- /dev/null +++ b/texinfo-6.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ae2e61d87c6310f9af7c6f2426bd0470f251d1a6deb61fba83a3b3baff32c3a +size 4497624 diff --git a/texinfo-6.4.tar.xz.sig b/texinfo-6.4.tar.xz.sig new file mode 100644 index 0000000..c442f18 --- /dev/null +++ b/texinfo-6.4.tar.xz.sig @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iF4EABEIAAYFAllNTUoACgkQ3bxXnas3+6mbHgD/Up8qPYIhjUJ6MlwdreXAGE3a +8cYxYQPac7sZr4JdNh0BAK9Be9fz/e4eF/tbKUYNwwlrh9VGXIslXidnwFxJ/ugE +=uZzy +-----END PGP SIGNATURE----- diff --git a/texinfo-zlib.patch b/texinfo-zlib.patch index bfe2968..191b545 100644 --- a/texinfo-zlib.patch +++ b/texinfo-zlib.patch @@ -1,13 +1,8 @@ -Index: texinfo-6.0/install-info/Makefile.in +Index: texinfo-6.4/install-info/Makefile.in =================================================================== ---- - 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)" +--- texinfo-6.4.orig/install-info/Makefile.in ++++ texinfo-6.4/install-info/Makefile.in +@@ -221,7 +221,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) @@ -16,8 +11,10 @@ Index: texinfo-6.0/install-info/Makefile.in am__DEPENDENCIES_1 = ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ $(am__DEPENDENCIES_1) ---- texinfo-6.0/install-info/install-info.c -+++ texinfo-6.0/install-info/install-info.c 2015-07-15 12:45:21.689530651 +0000 +Index: texinfo-6.4/install-info/install-info.c +=================================================================== +--- texinfo-6.4.orig/install-info/install-info.c ++++ texinfo-6.4/install-info/install-info.c @@ -22,6 +22,7 @@ #include #include @@ -91,7 +88,7 @@ Index: texinfo-6.0/install-info/Makefile.in } #ifdef __MSDOS__ if (!f) -@@ -942,8 +968,22 @@ output_dirfile (char *dirfile, int dir_n +@@ -961,8 +987,22 @@ output_dirfile (char *dirfile, int dir_n if (compression_program) { diff --git a/texinfo.changes b/texinfo.changes index 6ff924a..729b930 100644 --- a/texinfo.changes +++ b/texinfo.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Wed Jul 12 12:48:12 UTC 2017 - mpluskal@suse.com + +- Update to version 6.4: + * texi2any: + + for HTML output, place section names before the manual in page + titles, instead of after them, so it is easier to distinguish pages + if titles are truncated + + starting points for ordered lists beginning with 0 or a letter of + the alphabet are output as attributes on the
    tag, as was + case for Texinfo 4.13 and earlier + + a bit faster + + some discrepancies in paragraph formatting between Perl extension + modules and interpreted Perl modules have been fixed + + `MACRO_BODY_IGNORES_LEADING_SPACE' customization variable removed, + and `indent_menu_descriptions' is no longer a possible value for + `TREE_TRANSFORMATIONS' (as these features did not work as + documented) + * info: + + the `up-line' and `down-line' commands now are like the other + scrolling commands and are no longer confined to a single node + (depending on the value of `scroll-behaviour') + + supplying the --all option with --index-search displays a list + of matching index entries + + the style variables like `link-style' can now be set while info + is running + + display bug fixed where color could be turned off prematurely + + several other bugs fixed + + better portability in test suite + + do not fall back to showing the dir node if a manual isn't found + + Do not attempt any kind of conversion of CR LF line endings, + except on MS-DOS/Windows, when it is done unconditionally. (This + replaces a more complicated approach, where this conversion would + take place if there was a problem finding a node in a file.) The + main effect of this change is that Info files with CR LF line + endings, which would have been produced on MS-DOS/Windows with old + versions of makeinfo, are only supported on such operating systems. + + a few of the key bindings under --vi-keys have been changed for + consistency or to match the documentation + * texinfo.tex + + a DVI file with a single empty page can be output again, which + restores the behavior from Texinfo 6.0 and earlier +- Small packaging clenup: + * Drop conditions for old releases + * Run spec-cleaner + * Run testsuite + ------------------------------------------------------------------- Fri Jan 20 10:02:38 UTC 2017 - rmaliska@suse.com diff --git a/texinfo.spec b/texinfo.spec index 258fbf5..bd1d364 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -17,7 +17,7 @@ Name: texinfo -Version: 6.3 +Version: 6.4 Release: 0 Summary: Tools Needed to Create Documentation from Texinfo Sources License: GPL-3.0+ @@ -36,29 +36,22 @@ BuildRequires: ncurses-devel BuildRequires: perl BuildRequires: perl-Text-Unidecode BuildRequires: perl-gettext -BuildRequires: perl-libintl-perl BuildRequires: perl-macros BuildRequires: zlib-devel Requires: makeinfo = %{version} Requires: perl Requires: perl-Text-Unidecode Requires: perl-gettext -Requires: perl-libintl-perl -Requires(post): %install_info_prereq -Requires(preun): %install_info_prereq -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1220 Requires: texlive-bibtex Requires: texlive-latex Requires: texlive-makeindex Requires: texlive-pdftex Requires: texlive-tex Requires: texlive-texinfo -%endif -%if 0%{?suse_version} > 1310 +Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} Recommends: texi2html Recommends: texi2roff -%endif %description Texinfo is a documentation system that uses a single source file to @@ -101,8 +94,9 @@ or standalone GNU Info. %patch1 -p1 %build -%configure --with-external-Text-Unidecode --with-external-libintl-perl --with-gnu-ld --enable-perl-xs - +%configure \ + --with-external-Text-Unidecode \ + --enable-perl-xs make %{?_smp_mflags} %install @@ -128,20 +122,22 @@ install -m 644 %{SOURCE10} %{buildroot}%{_infodir}/dir %find_lang %{name} %{name}.lang %find_lang %{name}_document %{name}_document.lang +%check +make %{?_smp_mflags} check + %post -%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info%{ext_info} %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info%{ext_info} %post -n info -%install_info --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/info-stnd.info%{ext_info} %preun -n info -%install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info%{ext_info} %files -f %{name}_document.lang -%defattr(-, root, root) %doc ABOUT-NLS AUTHORS COPYING NEWS README TODO %doc doc/texinfo.tex doc/txi-*.tex %{_bindir}/pod2texi @@ -149,25 +145,23 @@ install -m 644 %{SOURCE10} %{buildroot}%{_infodir}/dir %{_bindir}/texi2pdf %{_bindir}/texindex %{_bindir}/pdftexi2dvi -%{_infodir}/texinfo*.gz -%{_mandir}/man1/pod2texi.1.gz -%{_mandir}/man1/texindex.1.gz -%{_mandir}/man1/texi2dvi.1.gz -%{_mandir}/man1/texi2pdf.1.gz -%{_mandir}/man1/pdftexi2dvi.1.gz -%{_mandir}/man5/texinfo.5.gz +%{_infodir}/texinfo*%{ext_info} +%{_mandir}/man1/pod2texi.1%{ext_man} +%{_mandir}/man1/texindex.1%{ext_man} +%{_mandir}/man1/texi2dvi.1%{ext_man} +%{_mandir}/man1/texi2pdf.1%{ext_man} +%{_mandir}/man1/pdftexi2dvi.1%{ext_man} +%{_mandir}/man5/texinfo.5%{ext_man} %files -n makeinfo -f %{name}.lang -%defattr(-,root,root) %{_bindir}/makeinfo %{_bindir}/texi2any -%{_mandir}/man1/makeinfo.1.gz -%{_mandir}/man1/texi2any.1.gz +%{_mandir}/man1/makeinfo.1%{ext_man} +%{_mandir}/man1/texi2any.1%{ext_man} %{_libdir}/texinfo %{_datadir}/texinfo/ %files -n info -%defattr(-,root,root) %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir /sbin/install-info %{_bindir}/install-info