X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftexinfo.git;a=blobdiff_plain;f=texinfo.spec;h=2131d42d5b3bcc0798c6ccd0e09a1eee768e0d24;hp=3c0785a2b02c9f0b4103a2ba6c362e4449499ab6;hb=06c09bd7e5c2675520bfc8c0493207cf247e3154;hpb=ce647ac4f15f53b6548bcb5b26a4693525ba0b73

diff --git a/texinfo.spec b/texinfo.spec
index 3c0785a..2131d42 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -9,21 +9,25 @@ Summary(ru.UTF-8):	Инструменты для создания файлов 
 Summary(tr.UTF-8):	texinfo biçimleyici ve info okuyucu
 Summary(uk.UTF-8):	Інструменти для створення файлів документації формату Texinfo
 Name:		texinfo
-Version:	5.2
+Version:	6.5
 Release:	2
 License:	GPL v3+
 Group:		Applications/Publishing
 Source0:	http://ftp.gnu.org/gnu/texinfo/%{name}-%{version}.tar.xz
-# Source0-md5:	cb489df8a7ee9d10a236197aefdb32c5
+# Source0-md5:	3715197e62e0e07f85860b3d7aab55ed
 Source1:	info.desktop
 Patch0:		%{name}-info.patch
-URL:		http://texinfo.org/
+Patch1:		regex-fix.patch
+URL:		http://www.gnu.org/software/texinfo/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.14
-BuildRequires:	gettext-devel >= 0.18.3
+BuildRequires:	gettext-tools >= 0.19.8
 BuildRequires:	help2man
 BuildRequires:	ncurses-devel >= 5.0
+BuildRequires:	perl-Encode
+BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	perl-modules >= 1:5.8.0
+BuildRequires:	perl-tools-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-perlprov
 BuildRequires:	tar >= 1:1.22
@@ -184,12 +188,14 @@ Narzędzie do konwersji plików texinfo na dvi.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal} -I gnulib/m4
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--disable-static
 
 PATH="$PATH:../util" %{__make}
 
@@ -200,16 +206,22 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_sbindir},/sbin}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT%{_sbindir}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT%{_sbindir}
 ln -sf %{_sbindir}/install-info $RPM_BUILD_ROOT/sbin/install-info
 
+# perl modules
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/texinfo/*.la
+
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{de.us-ascii,de}/LC_MESSAGES/texinfo_document.mo
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{es.us-ascii,es}/LC_MESSAGES/texinfo_document.mo
+# copy of default encoding
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ca.us-ascii
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/de.us-ascii
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/pt.us-ascii
+# outdated copy of default encoding
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/pt_BR.us-ascii
+# normalize locale name
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{no.us-ascii,nb}/LC_MESSAGES/texinfo_document.mo
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{pt.us-ascii,pt}
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{pt_BR.us-ascii,pt_BR}
 
 %find_lang %{name}
 %find_lang texinfo_document
@@ -237,8 +249,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/texi2any
 %attr(755,root,root) %{_bindir}/texindex
 %{_datadir}/texinfo
-
-%{_infodir}/texinfo*
+%dir %{_libdir}/texinfo
+%attr(755,root,root) %{_libdir}/texinfo/MiscXS.so
+%attr(755,root,root) %{_libdir}/texinfo/XSParagraph.so
+%{_infodir}/texinfo*.info*
 %{_mandir}/man1/makeinfo.1*
 %{_mandir}/man1/pod2texi.1*
 %{_mandir}/man1/texi2any.1*
@@ -247,19 +261,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n info -f texinfo.lang
 %defattr(644,root,root,755)
-%doc info/README
 %attr(755,root,root) %{_bindir}/info
-%attr(755,root,root) %{_bindir}/infokey
 %attr(755,root,root) /sbin/install-info
 %attr(755,root,root) %{_sbindir}/install-info
-
 %{_desktopdir}/info.desktop
-
-%{_infodir}/info.info*
 %{_infodir}/info-stnd.info*
-
 %{_mandir}/man1/info.1*
-%{_mandir}/man1/infokey.1*
 %{_mandir}/man1/install-info.1*
 %{_mandir}/man5/info.5*