- updated to 5.0

- added info patch (unify direntry)
- added perl patch (fixes build with recent perl, which requires module to return true)

diff --git a/texi2html-info.patch b/texi2html-info.patch
new file mode 100644 (file)
index 0000000..d499542
--- /dev/null
+++ b/texi2html-info.patch
@@ -0,0 +1,14 @@
+--- texi2html-5.0/doc/texi2html.texi.orig      2010-06-30 18:56:54.000000000 +0200
++++ texi2html-5.0/doc/texi2html.texi   2013-10-27 13:34:17.248164943 +0100
+@@ -131,9 +131,9 @@
+ @c I think the conversion script should be found
+ @c where the documentation system lives.
+ @c What do you think?
+-@dircategory Texinfo documentation system
++@dircategory Texinfo documentation system:
+ @direntry
+-* Texi2HTML: (texi2html).  Texinfo to HTML Converter.
++* Texi2HTML: (texi2html).             Texinfo to HTML Converter
+ @end direntry
+ @c --------------------------------------------------------
+ 

diff --git a/texi2html-perl.patch b/texi2html-perl.patch
new file mode 100644 (file)
index 0000000..cbf62f7
--- /dev/null
+++ b/texi2html-perl.patch
@@ -0,0 +1,10 @@
+--- texi2html-5.0/manage_i18n.pl.in.orig       2013-10-27 13:57:29.184773196 +0100
++++ texi2html-5.0/manage_i18n.pl.in    2013-10-27 14:24:04.201372927 +0100
+@@ -235,6 +235,7 @@
+          {
+               print TRANSLATIONS;
+          }
++         print TRANSLATIONS "1;";
+          close FILE;
+     }
+ }

diff --git a/texi2html.spec b/texi2html.spec
index a26eec045bae580d487430478a87c1ff1849f521..020716e71d8ce2b2f59c79b8d7d205358f391215 100644 (file)
--- a/texi2html.spec
+++ b/texi2html.spec
@@ -1,17 +1,30 @@
+# NOTE: 5.0 is likely to be the last separate texi2html release (as merged into texinfo)
 %include       /usr/lib/rpm/macros.perl
 Summary:       texi2html is a Perl script that converts Texinfo files to HTML
 Summary(hu.UTF-8):     texi2html egy Perl szkript, amely Texinfo fájlokat konvertál HTML-be
+Summary(pl.UTF-8):     texi2html - skrypt Perla konwertujący pliki Texinfo do HTML-a
 Name:          texi2html
-Version:       1.82
-Release:       3
-License:       GPL
-Group:         Documentation
-Source0:       http://ftp.cc.uoc.gr/mirrors/nongnu.org/texi2html/%{name}-%{version}.tar.bz2
-# Source0-md5: a8a9193c0ac1bec2f3ca7be40a5a82eb
+Version:       5.0
+Release:       1
+License:       GPL v2+
+Group:         Development/Tools
+Source0:       http://download.savannah.gnu.org/releases/texi2html/%{name}-%{version}.tar.bz2
+# Source0-md5: f15ac876fcdc8be865b16535f480aa54
+Patch0:                %{name}-info.patch
+Patch1:                %{name}-perl.patch
 URL:           http://www.nongnu.org/texi2html/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.53
+BuildRequires: automake >= 1:1.9
+BuildRequires: gettext-devel >= 0.14
+BuildRequires: perl-Encode
+BuildRequires: perl-base
 BuildRequires: rpm-perlprov
+BuildRequires: texinfo
+Requires:      perl-Unicode-EastAsianWidth
+Requires:      perl-libintl
+Requires:      texinfo >= 5.0
+Suggests:      perl-Encode
+Suggests:      perl-Text-Unidecode
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,13 +33,24 @@ texi2html is a Perl script that converts Texinfo files to HTML.
 %description -l hu.UTF-8
 texi2html egy Perl szkript, amely Texinfo fájlokat konvertál HTML-be.
 
+%description -l pl.UTF-8
+texi2html to skrypt Perla konwertujący pliki Texinfo do HTML-a.
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
+%{__gettextize}
+cp -f po/Makefile.in.in po_document/
+cp -f po/Makefile.in.in po_messages/
 %{__aclocal}
 %{__autoconf}
-%configure
+%{__automake}
+%configure \
+       --with-external-Unicode-EastAsianWidth \
+       --with-external-libintl-perl
 %{__make}
 
 %install
@@ -36,15 +60,24 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 
+# only .us-ascii or base exists - merge them(?)
+for d in $RPM_BUILD_ROOT%{_localedir}/*.us-ascii ; do
+       outd=$RPM_BUILD_ROOT%{_localedir}/$(basename $d .us-ascii)/LC_MESSAGES
+       install -d $outd
+       %{__mv} $d/LC_MESSAGES/texi2html_document.mo $outd
+done
+%find_lang %{name} --all-name
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/texi2html
-%{_mandir}/man1/texi2html*
 %{_datadir}/texi2html
-%dir %{_datadir}/texinfo
+%{_datadir}/texinfo/init/*.init
 %dir %{_datadir}/texinfo/html
 %doc %{_datadir}/texinfo/html/texi2html.html
-%doc %{_datadir}/info/texi2html*
+%{_mandir}/man1/texi2html*
+%{_infodir}/texi2html.info*