iputils: update to 20101006, update ja.po

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3417 ec354946-7b23-47d6-9f5a-488ba84defc7

i/iputils/iputils-vl.spec

@@ -1,14 +1,15 @@
 Summary: Network monitoring tools including ping.
 Summary(ja): ping 等のネットワークモニタツール集
 Name: iputils
-Version: 20071127
-Release: 2%{?_dist_release}
+Version: 20101006
+Release: 1%{?_dist_release}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.skbuff.net/iputils
 Source0: http://www.skbuff.net/iputils//%{name}-s%{version}.tar.bz2
 Source1: ifenslave.tar.gz
 Source3: rdisc.initd
+Source5: rdisc.sysconfig
 
 Patch0: iputils-20020927-rh.patch
 Patch1: iputils-20020124-countermeasures.patch
@@ -16,26 +17,32 @@ Patch2: iputils-20020927-addrcache.patch
 Patch3: iputils-20020927-ping-subint.patch
 Patch4: iputils-ping_cleanup.patch
 Patch5: iputils-ifenslave.patch
-Patch6: iputils-20020927-arping-infiniband.patch
-Patch7: iputils-20070202-idn.patch
-Patch8: iputils-20070202-open-max.patch
-Patch9: iputils-20070202-traffic_class.patch
-Patch10: iputils-20070202-arping_timeout.patch
-Patch11: iputils-20071127-output.patch
-Patch12: iputils-20070202-ia64_align.patch
-Patch13: iputils-20071127-warnings.patch
-Patch14: iputils-20071127-typing_bug.patch
-Patch15: iputils-20071127-corr_type.patch
+Patch6: iputils-20070202-idn.patch
+Patch7: iputils-20070202-traffic_class.patch
+Patch8: iputils-20070202-ia64_align.patch
+Patch9: iputils-20071127-warnings.patch
+Patch10: iputils-20071127-corr_type.patch
+Patch11: iputils-20071127-infiniband.patch
+Patch12: iputils-20100418-convtoint.patch
+Patch13: iputils-20100418-flowlabel.patch
+Patch14: iputils-20101006-drop_caps.patch
+Patch15: iputils-20101006-unused.patch
+Patch16: iputils-20101006-man.patch
 
 # Vine Source(s)/Patch(es)
-Source10: iputils-20020927-ja.po
-Patch100: iputils-s20071127-gettext.patch
-
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-root
-BuildPreReq: docbook-utils perl-SGMLSpm
-BuildPreReq: glibc-kernheaders >= 2.4-8.19
-PreReq: chkconfig
+Source10: iputils-s20101006-ja.po
+Patch100: iputils-s20101006-gettext.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: docbook-utils perl-SGMLSpm
+BuildRequires: glibc-kernheaders >= 2.4-8.19
+BuildRequires: libidn-devel
+BuildRequires: openssl-devel
+BuildRequires: libcap-devel
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
 
 %description
 The iputils package contains basic utilities for monitoring a network,
@@ -52,16 +59,17 @@ the target machine is alive and receiving network traffic.
 %patch3 -p1 -b .ping-subint
 %patch4 -p1 -b .cleanup
 %patch5 -p1 -b .addr
-%patch6 -p1 -b .infiniband
-%patch7 -p1 -b .idn
-%patch8 -p1 -b .open-max
-%patch9 -p1 -b .traffic_class
-%patch10 -p1 -b .arping_timeout
-%patch11 -p1 -b .output
-%patch12 -p1 -b .ia64_align
-%patch13 -p1 -b .warnings
-%patch14 -p1 -b .typing_bug
-%patch15 -p1 -b .corr_type
+%patch6 -p1 -b .idn
+%patch7 -p1 -b .traffic_class
+%patch8 -p1 -b .ia64_align
+%patch9 -p1 -b .warnings
+%patch10 -p1 -b .corr_type
+%patch11 -p1 -b .infiniband
+%patch12 -p1 -b .convtoint
+%patch13 -p1 -b .flowlabel
+%patch14 -p1 -b .drop_caps
+%patch15 -p1 -b .unused
+%patch16 -p1 -b .man
 
 #
 %patch100 -p1 -b .gettext
@@ -79,12 +87,15 @@ export LDFLAGS="-pie"
 make %{?_smp_mflags} arping clockdiff ping ping6 rdisc tracepath tracepath6 po
 gcc -Wall $RPM_OPT_FLAGS ifenslave.c -o ifenslave
 make -C doc man
+make -C po
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+
 install -c clockdiff		${RPM_BUILD_ROOT}%{_sbindir}/
 install -cp arping		${RPM_BUILD_ROOT}/sbin/
 ln -s /sbin/arping		${RPM_BUILD_ROOT}%{_sbindir}/arping
@@ -112,6 +123,11 @@ ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
 
 install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
 install -m 755 -p %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rdisc
+
+make -C po install DESTDIR=$RPM_BUILD_ROOT
+
+%find_lang %{name}
 
 %post
 /sbin/chkconfig --add rdisc
@@ -131,33 +147,31 @@ fi
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc RELNOTES README.bonding
 %{_sbindir}/clockdiff
-%ifos linux
 /sbin/arping
 %{_sbindir}/arping
 %attr(4755,root,root)	/bin/ping
 /sbin/ifenslave
-%else
-%attr(4755,root,root)	%{_sbindir}/ping
-%{_sbindir}/arping
-%{_sbindir}/ifenslave
-%endif
 /sbin/rdisc
 %attr(4755,root,root) /bin/ping6
 /bin/tracepath
 /bin/tracepath6
-#%attr(4755,root,root)/bin/traceroute6
 %{_sbindir}/ping6
 %{_sbindir}/tracepath
 %{_sbindir}/tracepath6
-#%{_sbindir}/traceroute6
 %attr(0644,root,root) %{_mandir}/man8/*
-%config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
+%{_sysconfdir}/rc.d/init.d/rdisc
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rdisc
 
 %changelog
+* Tue Apr 12 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 20101006-1
+- new upstream release
+- merget with fedora/20101006-8
+- update gettext patch and ja.po
+
 * Fri Apr 03 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 20071127-2
 - rebuild to add sign..