Hello community, here is the log from the commit of package texinfo for openSUSE:Factory checked in at 2015-02-16 15:02:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texinfo (Old) and /work/SRC/openSUSE:Factory/.texinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/texinfo/texinfo.changes 2013-05-13 15:44:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.texinfo.new/texinfo.changes 2015-02-16 17:48:26.000000000 +0100 @@ -1,0 +2,68 @@ +Fri Feb 6 17:51:37 UTC 2015 - dims...@opensuse.org + +- Add perl(Locale::Messages) and perl(Text::Unidecode) Requires to + makeinfo: since the switch to using the external ones, we also + must ensure to have them present for the user to execute + makeinfo. And makeinfo can be installed without texinfo (which + already does require those modules too). + +------------------------------------------------------------------- +Fri Feb 6 15:58:27 UTC 2015 - wer...@suse.de + +- Avoid including builtin perl-libintl-perl but require the package +- The same for perl-Text-Unidecode +- Move %install_info_delete from %postun to %preun + +------------------------------------------------------------------- +Fri Feb 6 11:12:09 UTC 2015 - dims...@opensuse.org + +- Recommend instead of Require texi2html and texi2roff: they are + not stricly required to operate texinfo, but can be valuable to + the users installing it. + +------------------------------------------------------------------- +Thu Feb 5 20:23:34 UTC 2015 - dims...@opensuse.org + +- Completely splitt off texi2html and texi2roff into their own + package containers. As a consequence, we no longer carry those + files / patches here (they live in their respective other + packages): texi2html-1.78.dif, texi2html-5.0.tar.bz2, + texi2html-5584.patch, texi2html.changes, texi2html.spec, + texi2roff-2.0-gcc4.patch, texi2roff-2.0.dif, texi2roff-2.0.tar.gz, + texi2roff.changes, texi2roff.patch.gz and texi2roff.spec. + +------------------------------------------------------------------- +Fri Sep 12 13:45:49 UTC 2014 - wer...@suse.de + +- Be aware that texinfo is GPL-3.0+ +- Require texi2html as well as readded texi2roff to make the build + system happy + +------------------------------------------------------------------- +Wed Aug 6 18:32:36 UTC 2014 - dmitr...@opensuse.org + +- Update to version 5.2 + * New texinfo commands + * texi2any is the new generic converter for Texinfo that can + produce all supported output formats, both those from texi2dvi + (PDF/DVI) and from makeinfo (Info/HTML/etc.). texi2any and + makeinfo are now different names for the same program; there + are no differences in behavior based on the program name. + * See more detail at included NEWS file + * Remove obsolete texinfo-4.12.dif + * Remove obsolete texi2html-1.78.dif + * Remove obsolete texi2roff-2.0.dif + * Remove obsolete texi2roff.patch.bz2 + * Remove obsolete texinfo-4.8-echo.patch + * Remove obsolete texi2roff-2.0-gcc4.patch + * Remove obsolete texinfo-4.13a-bug640417.diff + * Remove obsolete texinfo-4.13a-bug713517.diff + * Remove obsolete automake-1.12.patch + * Remove obsolete texinfo-4.13a-bug788574.diff + * Remove obsolete config-guess-sub-update.patch + * Rebase texinfo-4.12-zlib.patch to texinfo-zlib.patch +- Merge makeinfo into main package +- Drop not maintained texi2roff +- Drop not maintained texi2html + +------------------------------------------------------------------- Old: ---- automake-1.12.patch config-guess-sub-update.patch texi2html-1.78.dif texi2html-1.82.tar.bz2 texi2roff-2.0-gcc4.patch texi2roff-2.0.dif texi2roff-2.0.tar.bz2 texi2roff.patch.bz2 texinfo-4.12-zlib.patch texinfo-4.12.dif texinfo-4.13a-bug640417.diff texinfo-4.13a-bug713517.diff texinfo-4.13a-bug788574.diff texinfo-4.13a.tar.bz2 texinfo-4.8-echo.patch New: ---- texinfo-5.2.tar.gz texinfo-zlib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texinfo.spec ++++++ --- /var/tmp/diff_new_pack.may8qf/_old 2015-02-16 17:48:27.000000000 +0100 +++ /var/tmp/diff_new_pack.may8qf/_new 2015-02-16 17:48:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package texinfo # -# Copyright (c) 2013 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,27 +17,33 @@ Name: texinfo +Version: 5.2 +Release: 0 +Summary: Tools Needed to Create Documentation from Texinfo Sources +License: GPL-3.0+ +Group: Productivity/Publishing/Texinfo +Url: http://www.gnu.org/software/texinfo/ +Source0: ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.gz +Source10: info-dir +Patch1: texinfo-zlib.patch BuildRequires: automake BuildRequires: help2man BuildRequires: libbz2-devel +BuildRequires: libpth-devel BuildRequires: libzio-devel BuildRequires: ncurses-devel +BuildRequires: perl +Requires: perl-Text-Unidecode +Requires: perl-gettext +Requires: perl-libintl-perl +BuildRequires: perl-Text-Unidecode BuildRequires: perl-gettext +BuildRequires: perl-libintl-perl +BuildRequires: perl-macros BuildRequires: zlib-devel -Version: 4.13a -Release: 0 -%global version_t2h 1.82 -%global version_t2r 2.0 -Summary: Tools Needed to Create Documentation from Texinfo Sources -License: GPL-2.0+ and GPL-3.0+ -Group: Productivity/Publishing/Texinfo -Url: http://www.texinfo.org -PreReq: %{install_info_prereq} -Provides: texi2html = %{version_t2h} -Provides: texi2roff = %{version_t2r} -%if %suse_version > 1220 -Requires: latex2html Requires: makeinfo +Requires: perl +%if 0%{?suse_version} > 1220 Requires: texlive-bibtex Requires: texlive-latex Requires: texlive-makeindex @@ -45,24 +51,11 @@ Requires: texlive-tex Requires: texlive-texinfo %endif -Source: ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.bz2 -Source1: http://download.savannah.nongnu.org/releases/texi2html/texi2html-%{version_t2h}.tar.bz2 -# texinfo.org: the domain is expired. -# http://texinfo.org/texi2roff/texi2roff-%{version_t2r}.tar.bz2 -Source2: texi2roff-%{version_t2r}.tar.bz2 -Source10: info-dir -Patch: texinfo-4.12.dif -Patch1: texi2html-1.78.dif -Patch2: texi2roff-2.0.dif -Patch3: texi2roff.patch.bz2 -Patch4: texinfo-4.12-zlib.patch -Patch5: texinfo-4.8-echo.patch -Patch6: texi2roff-2.0-gcc4.patch -Patch7: texinfo-4.13a-bug640417.diff -Patch8: texinfo-4.13a-bug713517.diff -Patch9: automake-1.12.patch -Patch10: texinfo-4.13a-bug788574.diff -Patch11: config-guess-sub-update.patch +%if 0%{?suse_version} > 1310 +Recommends: texi2html +Recommends: texi2roff +%endif +Requires(pre): %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -74,13 +67,10 @@ file with nodes, menus, cross-references, and indices using the included makeinfo tool. -Aggregated with texinfo in this package is texi2html and texi2roff. - %package -n info Summary: A Stand-Alone Terminal-Based Info Browser -License: GPL-3.0+ Group: Productivity/Publishing/Texinfo -PreReq: bash +Requires(pre): bash %description -n info Info is a terminal-based program for reading documentation of computer @@ -90,8 +80,12 @@ %package -n makeinfo Summary: Translate Texinfo documents to info format -License: GPL-3.0+ Group: Productivity/Publishing/Texinfo +Requires: perl +# /usr/share/texinfo/Texinfo/Report.pm uses Locale::Messages +Requires: perl(Locale::Messages) +# /usr/share/texinfo/Texinfo/Convert/NodeNameNormalization.pm uses Text::Unidecode +Requires: perl(Text::Unidecode) Provides: texinfo:/usr/bin/makeinfo Suggests: texinfo @@ -101,127 +95,84 @@ or standalone GNU Info. %prep -rm -rf texi2html-%{version_t2h} texi2roff-%{version_t2r} -%setup -q -b 1 -b 2 -n texinfo-4.13 -%patch4 -p0 -b .zlib -%patch5 -p0 -b .echo -%patch7 -p1 -b .size_t -%patch8 -p0 -b .egrep -%patch9 -p1 -%patch10 -p0 -b .appendix -%patch -p0 -pushd ../texi2html-%{version_t2h} -%patch1 -p0 -%patch11 -popd -pushd ../texi2roff-%{version_t2r} -%patch3 -p0 -b .Bader -%patch2 -p0 -%patch6 -p1 -popd +%setup -q +%patch1 -p1 %build - HOST=%{_target_cpu}-suse-linux - CFLAGS="$RPM_OPT_FLAGS -pipe" - LDFLAGS="" - CC=gcc - export CFLAGS LDFLAGS CC - export SUSE_ASNEEDED=0 - AUTOPOINT=true autoreconf -fi - ./configure --build=$HOST \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} \ - --datadir=%{_datadir} \ - --infodir=%{_infodir} \ - --without-included-gettext \ - --enable-nls - PATH=${PWD}/makeinfo:${PWD}/util:$PATH - export PATH - make %{?_smp_mflags}; -pushd ../texi2html-%{version_t2h} - ./configure --build=$HOST \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} \ - --datadir=%{_datadir} \ - --infodir=%{_infodir} \ - --without-included-gettext \ - --enable-nls - make %{?_smp_mflags}; -popd -pushd ../texi2roff-%{version_t2r} - rm -f texi2roff - make %{?_smp_mflags}; -popd +%configure --with-external-Text-Unidecode --with-external-libintl-perl --with-gnu-ld + +make %{?_smp_mflags} %install - export SUSE_ASNEEDED=0 - make DESTDIR=%{buildroot} \ - infodir=%{_infodir} \ - htmldir=%{_defaultdocdir}/texi2html install - rm -f %{buildroot}%{_infodir}/info.info* - 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-%{version_t2h} - make DESTDIR=%{buildroot} \ - infodir=%{_infodir} \ - texinfohtmldir=%{_defaultdocdir}/texi2html install - install -m 644 README %{buildroot}%{_defaultdocdir}/texi2html/ - install -m 644 NEWS %{buildroot}%{_defaultdocdir}/texi2html/ - install -m 644 COPYING %{buildroot}%{_defaultdocdir}/texi2html/ -popd -pushd ../texi2roff-%{version_t2r} - doc=%{_defaultdocdir}/texi2roff - 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 -%find_lang %name %{name}.lang +%make_install +if cmp %{buildroot}%{_bindir}/pdftexi2dvi %{buildroot}%{_bindir}/texi2pdf +then + rm -vf %{buildroot}%{_bindir}/pdftexi2dvi + ln -sf texi2pdf %{buildroot}%{_bindir}/pdftexi2dvi +fi +if cmp %{buildroot}%{_mandir}/man1/pdftexi2dvi.1 %{buildroot}%{_mandir}/man1/texi2pdf.1 +then + rm -vf %{buildroot}%{_mandir}/man1/pdftexi2dvi.1 + ln -sf texi2pdf.1.gz %{buildroot}%{_mandir}/man1/pdftexi2dvi.1.gz +fi + +rm -f %{buildroot}%{_bindir}/makeinfo +cp %{buildroot}%{_bindir}/texi2any %{buildroot}%{_bindir}/makeinfo + +mkdir -p %{buildroot}/sbin +mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/ +ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info -%clean -test -n "%{buildroot}" && rm -rf %{buildroot} +install -m 644 %{SOURCE10} %{buildroot}%{_infodir}/dir -%post -%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.gz -%install_info --info-dir=%{_infodir} %{_infodir}/texi2html.info.gz +# part of emacs-info +rm -f %{buildroot}%{_infodir}/info.info* -%postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/texi2html.info.gz +%find_lang %{name} %{name}.lang +%find_lang %{name}_document %{name}_document.lang + +%post +%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info-1.gz +%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info-2.gz +%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info-3.gz + +%preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info-1.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info-2.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info-3.gz %post -n info %install_info --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz -%postun -n info +%preun -n info %install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz -%files +%files -f %{name}_document.lang %defattr(-, root, root) -%dir %{_defaultdocdir}/texi2html -%dir %{_defaultdocdir}/texi2roff -%doc ABOUT-NLS AUTHORS COPYING INTRODUCTION NEWS README TODO +%doc ABOUT-NLS AUTHORS COPYING NEWS README TODO %doc doc/texinfo.tex doc/txi-*.tex -%doc %{_defaultdocdir}/texi2html/* -%doc %{_defaultdocdir}/texi2roff/* -%{_bindir}/pdftexi* -%{_bindir}/texi* +%{_bindir}/pod2texi +%{_bindir}/texi2any +%{_bindir}/texi2dvi +%{_bindir}/texi2pdf +%{_bindir}/texindex +%{_bindir}/pdftexi2dvi %{_infodir}/texinfo*.gz -%{_infodir}/texi2html*.gz +%{_mandir}/man1/pod2texi.1.gz +%{_mandir}/man1/texi2any.1.gz +%{_mandir}/man1/texindex.1.gz +%{_mandir}/man1/texi2dvi.1.gz +%{_mandir}/man1/texi2pdf.1.gz %{_mandir}/man1/pdftexi2dvi.1.gz -%{_mandir}/man1/texi*.1.gz %{_mandir}/man5/texinfo.5.gz -%{_datadir}/texinfo -%{_datadir}/texi2html %files -n makeinfo -f %{name}.lang %defattr(-,root,root) %{_bindir}/makeinfo %{_mandir}/man1/makeinfo.1.gz +%{_datadir}/texinfo/ %files -n info %defattr(-,root,root) ++++++ texinfo-zlib.patch ++++++ Index: texinfo-5.2/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)" PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) -ginstall_info_LDADD = $(LDADD) +ginstall_info_LDADD = $(LDADD) -lzio 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 @@ -22,6 +22,7 @@ #include <getopt.h> #include <regex.h> #include <argz.h> +#include <zio.h> #define TAB_WIDTH 8 @@ -687,10 +688,31 @@ open_possibly_compressed_file (char *fil *opened_filename = filename; f = fopen (*opened_filename, FOPEN_RBIN); + 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); + } if (!f) { *opened_filename = concat (filename, ".gz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = fzopen (*opened_filename, FOPEN_RBIN); + *compression_program = "g"; } if (!f) { @@ -702,7 +724,8 @@ open_possibly_compressed_file (char *fil { free (*opened_filename); *opened_filename = concat (filename, ".bz2", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = fzopen (*opened_filename, FOPEN_RBIN); + *compression_program = "b"; } 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); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
