SPECS: inetutils.spec - up to 1.5, updated nolibs patch, added tin...

Sun Nov 19 22:14:32 CET 2006

Author: qboosh                       Date: Sun Nov 19 21:14:32 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.5, updated nolibs patch, added tinfo patch

---- Files affected:
SPECS:
   inetutils.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/inetutils.spec
diff -u SPECS/inetutils.spec:1.11 SPECS/inetutils.spec:1.12

--- SPECS/inetutils.spec:1.11	Wed Oct 25 20:26:51 2006
+++ SPECS/inetutils.spec	Sun Nov 19 22:14:27 2006
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 # TODO:
+# - package ifconfig?
 # - rc-scripts for: ftpd,telnetd(?),rlogind,uucpd
 # - rc-inetd for: ftpd, telnetd,tftpd,rexecd,rlogind,talkd,uucpd
 # - default configs for:
@@ -13,12 +14,12 @@
 Summary:	Common networking utilities and servers
 Summary(pl):	Popularne narzędzia i serwery sieciowe
 Name:		inetutils
-Version:	1.4.2
-Release:	0.4
+Version:	1.5
+Release:	0.1
 License:	GPL
 Group:		Networking/Utilities
 Source0:	ftp://ftp.gnu.org/gnu/inetutils/%{name}-%{version}.tar.gz
-# Source0-md5:	df0909a586ddac2b7a0d62795eea4206
+# Source0-md5:	9e0f1ac040de3168ea785f44e42d585e
 # syslogd:
 Source1:	%{name}-syslog.conf
 Source2:	%{name}-syslog.init
@@ -34,9 +35,12 @@
 # patches:
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-nolibs.patch
+Patch2:		%{name}-tinfo.patch
 URL:		http://www.gnu.org/software/inetutils/
-BuildRequires:	autoconf >= 2.54
-BuildRequires:	automake >= 1:1.7
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.9
+# for config.rpath
+BuildRequires:	gettext-devel
 BuildRequires:	libwrap-devel
 BuildRequires:	pam-devel
 BuildRequires:	readline-devel
@@ -360,9 +364,12 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+cp -f /usr/share/gettext/config.rpath build-aux
 
 %build
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -396,7 +403,10 @@
 	> $RPM_BUILD_ROOT/var/log/$n
 done
 
-mv $RPM_BUILD_ROOT%{_bindir}/ping $RPM_BUILD_ROOT/bin/
+# follow FHS
+mv $RPM_BUILD_ROOT%{_bindir}/ping $RPM_BUILD_ROOT/bin
+# unify path
+mv $RPM_BUILD_ROOT%{_bindir}/ping6 $RPM_BUILD_ROOT/bin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -457,7 +467,6 @@
 
 %files ftp
 %defattr(644,root,root,755)
-%doc ftp/ChangeLog
 %attr(755,root,root) %{_bindir}/ftp
 %{_desktopdir}/ftp.desktop
 %{_pixmapsdir}/ftp.png
@@ -465,49 +474,43 @@
 
 %files ftpd
 %defattr(644,root,root,755)
-%doc ftpd/ChangeLog
 %attr(755,root,root) %{_sbindir}/ftpd
 %{_mandir}/man8/ftpd.8*
 
 %files inetd
 %defattr(644,root,root,755)
-%doc inetd/{ChangeLog,TODO}
 %attr(755,root,root) %{_sbindir}/inetd
 %{_mandir}/man8/inetd.8*
 
 %files logger
 %defattr(644,root,root,755)
-%doc logger/ChangeLog
 %attr(755,root,root) %{_bindir}/logger
 %{_mandir}/man1/logger.1*
 
 %files ping
 %defattr(644,root,root,755)
-%doc ping/{ChangeLog,TODO}
+%doc ping/TODO
 %attr(4754,root,adm) /bin/ping
+%attr(4754,root,adm) /bin/ping6
 %{_mandir}/man8/ping.8*
 
 %files rexecd
 %defattr(644,root,root,755)
-%doc rexecd/ChangeLog
 %attr(755,root,root) %{_sbindir}/rexecd
 %{_mandir}/man8/rexecd.8*
 
 %files rlogin
 %defattr(644,root,root,755)
-%doc rlogin/ChangeLog
 %attr(4755,root,root) %{_bindir}/rlogin
 %{_mandir}/man1/rlogin.1*
 
 %files rlogind
 %defattr(644,root,root,755)
-%doc rlogind/ChangeLog
 %attr(755,root,root) %{_sbindir}/rlogind
 %{_mandir}/man8/rlogind.8*
 
 %files rsh
 %defattr(644,root,root,755)
-%doc rsh/ChangeLog
 %attr(4755,root,root) %{_bindir}/rcp
 %attr(4755,root,root) %{_bindir}/rsh
 %{_mandir}/man1/rcp.1*
@@ -515,13 +518,11 @@
 
 %files rshd
 %defattr(644,root,root,755)
-%doc rshd/ChangeLog
 %attr(755,root,root) %{_sbindir}/rshd
 %{_mandir}/man8/rshd.8*
 
 %files syslogd
 %defattr(644,root,root,755)
-%doc syslogd/ChangeLog
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/syslog
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog
@@ -533,19 +534,16 @@
 
 %files talk
 %defattr(644,root,root,755)
-%doc talk/ChangeLog
 %attr(755,root,root) %{_bindir}/talk
 %{_mandir}/man1/talk.1*
 
 %files talkd
 %defattr(644,root,root,755)
-%doc talkd/ChangeLog
 %attr(755,root,root) %{_sbindir}/talkd
 %{_mandir}/man8/talkd.8*
 
 %files telnet
 %defattr(644,root,root,755)
-%doc telnet/ChangeLog
 %attr(755,root,root) %{_bindir}/telnet
 %{_desktopdir}/telnet.desktop
 %{_pixmapsdir}/telnet.png
@@ -553,31 +551,27 @@
 
 %files telnetd
 %defattr(644,root,root,755)
-%doc telnetd/ChangeLog
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/telnetd
 %attr(755,root,root) %{_sbindir}/telnetd
 %{_mandir}/man8/telnetd.8*
 
 %files tftp
 %defattr(644,root,root,755)
-%doc tftp/ChangeLog
 %attr(755,root,root) %{_bindir}/tftp
 %{_mandir}/man1/tftp.1*
 
 %files tftpd
 %defattr(644,root,root,755)
-%doc tftpd/ChangeLog
 %attr(755,root,root) %{_sbindir}/tftpd
 %{_mandir}/man8/tftpd.8*
 
 %files uucpd
 %defattr(644,root,root,755)
-%doc uucpd/ChangeLog
 %attr(755,root,root) %{_sbindir}/uucpd
 
 %files whois
 %defattr(644,root,root,755)
-%doc gwhois/{ChangeLog,README,TODO}
+%doc gwhois/{README,TODO}
 %attr(755,root,root) %{_bindir}/whois
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -586,6 +580,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/11/19 21:14:27  qboosh
+- up to 1.5, updated nolibs patch, added tinfo patch
+
 Revision 1.11  2006/10/25 18:26:51  glen
 - strict internal deps; adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/inetutils.spec?r1=1.11&r2=1.12&f=u

