SPECS (RA-branch): texinfo.spec - merged version 4.8 from HEAD, ad...

[hawk]

Author: hawk                         Date: Thu Dec 29 00:06:39 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- merged version 4.8 from HEAD, adjusted for Ra
- release 2

---- Files affected:
SPECS:
   texinfo.spec (1.71.2.2 -> 1.71.2.3) 

---- Diffs:

================================================================
Index: SPECS/texinfo.spec
diff -u SPECS/texinfo.spec:1.71.2.2 SPECS/texinfo.spec:1.71.2.3
--- SPECS/texinfo.spec:1.71.2.2	Fri Aug 27 12:22:34 2004
+++ SPECS/texinfo.spec	Thu Dec 29 01:06:34 2005
@@ -9,27 +9,23 @@
 Summary(tr):	texinfo biçimleyici ve info okuyucu
 Summary(uk):	śÎÓÔŇŐÍĹÎÔÉ ÄĚŃ ÓÔ×ĎŇĹÎÎŃ ĆÁĘĚŚ× ÄĎËŐÍĹÎÔÁĂŚ§ ĆĎŇÍÁÔŐ Texinfo
 Name:		texinfo
-Version:	4.2
-Release:	5
+Version:	4.8
+Release:	2
 License:	GPL
 Group:		Applications/Publishing
-Source0:	ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5:	41a97498d34ddbf245df40a95977be7f
+Source0:	ftp://ftp.gnu.org/gnu/texinfo/%{name}-%{version}.tar.bz2
+# Source0-md5:	6ba369bbfe4afaa56122e65b3ee3a68c
 Source1:	info.desktop
-Patch0:		%{name}-fix.patch
-Patch1:		%{name}-zlib.patch
-Patch2:		%{name}-info.patch
-Patch3:		%{name}-fileextension.patch
-Patch4:		%{name}-ALL_LINGUAS.patch
-Patch5:		%{name}-ac_fixes.patch
-Patch6:		%{name}-am_fixes.patch
+Patch0:		%{name}-info.patch
+Patch1:		%{name}-ac_am.patch
 URL:		http://texinfo.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	ncurses-devel >= 5.0
+BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
-Requires:	info = %{version}
+Requires:	info = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -125,7 +121,7 @@
 Summary(tr):	GNU texinfo belgeleri için tty tabanlý görüntüleyici
 Summary(uk):	đŇĎÇŇÁÍÁ ÄĚŃ ĐĹŇĹÇĚŃÄŐ ÄĎËŐÍĹÎÔŚ× × ĆĎŇÍÁÔŚ GNU texinfo ÎÁ ÔĹËÓÔĎ×ĎÍŐ ÔĹŇÍŚÎÁĚŚ
 Group:		Applications/System
-Prereq:		fix-info-dir
+PreReq:		fix-info-dir
 Obsoletes:	info-install
 
 %description -n info
@@ -170,8 +166,8 @@
 Summary:	Texinfo to dvi conversion tool
 Summary(pl):	Narzędzie do konwersji texinfo na dvi
 Group:		Applications/Publishing
-Requires:	%{name} = %{version}
-Requires:	tetex
+Requires:	%{name} = %{version}-%{release}
+Requires:	tetex-format-plain
 
 %description texi2dvi
 Texinfo to dvi conversion tool.
@@ -183,36 +179,31 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+
+# nb was added but outdated no not removed
+sed -i -e '/^no$/d' po/LINGUAS
 
 %build
-rm -f missing m4/{codeset,gettext,glibc21,iconv,isc-posix,lcmessage,progtest}.m4
-ln -sf version.texi doc/version2.texi
-%{__gettextize}
+# don't touch - too fresh m4 macros required (newer than in gettext 0.14.1)
+#%%{__autopoint}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-%configure \
-	--without-included-gettext
-%{__make} -C doc maintainer-clean-aminfo
+%configure
+
 %{__make}
-rm -f util/install-info
-%{__make} -C util
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Help,%{_sbindir},/sbin}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_sbindir},/sbin}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT%{_sbindir}
 ln -sf %{_sbindir}/install-info $RPM_BUILD_ROOT/sbin/install-info
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Help
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %find_lang %{name}
 
@@ -248,18 +239,20 @@
 %attr(755,root,root) /sbin/install-info
 %attr(755,root,root) %{_sbindir}/install-info
 
-%{_applnkdir}/Help/info.desktop
+%{_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*
 
 %files texi2dvi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/texi2dvi
+%attr(755,root,root) %{_bindir}/texi2pdf
 %{_mandir}/man1/texi2dvi.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -268,6 +261,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.3  2005/12/29 00:06:34  hawk
+- merged version 4.8 from HEAD, adjusted for Ra
+- release 2
+
 Revision 1.71.2.2  2004/08/27 10:22:34  twittner
 - md5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/texinfo.spec?r1=1.71.2.2&r2=1.71.2.3&f=u