|
|
@@ -1,8 +1,8 @@
|
|
|
Summary: Network monitoring tools including ping.
|
|
|
Summary(ja): ping 等のネットワークモニタツール集
|
|
|
Name: iputils
|
|
|
-Version: 20161105
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 20180629
|
|
|
+Release: 1%{?_dist_release}
|
|
|
# some parts are under the original BSD (ping.c)
|
|
|
# some are under GPLv2+ (tracepath.c)
|
|
|
License: BSD and GPLv2+
|
|
|
@@ -20,14 +20,10 @@ Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
|
|
|
|
|
Patch0: iputils-rh.patch
|
|
|
Patch1: iputils-ifenslave.patch
|
|
|
-Patch2: 0001-arping-tracepath-removed-unused-idna-header.patch
|
|
|
-Patch3: 0002-traceroute6-use-getaddrinfo-IDNA-conversion.patch
|
|
|
-Patch4: 0003-ping6-simplified-IDNA-usage.patch
|
|
|
-Patch5: 0004-ping-use-libidn2-instead-of-libidn.patch
|
|
|
|
|
|
# Vine Source(s)/Patch(es)
|
|
|
-Source1000: iputils-s20161105-ja.po
|
|
|
-Patch1000: iputils-s20161105-gettext.patch
|
|
|
+Source1000: iputils-s20180629-ja.po
|
|
|
+Patch1000: iputils-s20180629-gettext.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
BuildRequires: docbook-utils perl-SGMLSpm
|
|
|
@@ -35,6 +31,8 @@ BuildRequires: glibc-kernheaders >= 2.4-8.19
|
|
|
BuildRequires: libidn2-devel
|
|
|
BuildRequires: openssl-devel
|
|
|
BuildRequires: libcap-devel
|
|
|
+BuildRequires: libxslt
|
|
|
+BuildRequires: docbook-style-xsl
|
|
|
Requires(post): chkconfig
|
|
|
Requires(preun): chkconfig
|
|
|
Requires(preun): initscripts
|
|
|
@@ -56,10 +54,6 @@ cp %{SOURCE10} %{SOURCE11} .
|
|
|
|
|
|
%patch0 -p1
|
|
|
%patch1 -p1
|
|
|
-%patch2 -p1
|
|
|
-%patch3 -p1
|
|
|
-%patch4 -p1
|
|
|
-%patch5 -p1
|
|
|
|
|
|
#
|
|
|
%patch1000 -p1 -b .gettext
|
|
|
@@ -125,10 +119,6 @@ make -C po install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
%find_lang %{name}
|
|
|
|
|
|
-iconv -f ISO88591 -t UTF8 RELNOTES -o RELNOTES.tmp
|
|
|
-touch -r RELNOTES RELNOTES.tmp
|
|
|
-mv -f RELNOTES.tmp RELNOTES
|
|
|
-
|
|
|
%post
|
|
|
/sbin/chkconfig --add rdisc
|
|
|
/sbin/chkconfig --add ninfod
|
|
|
@@ -153,7 +143,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root,root)
|
|
|
-%doc bsd.txt gpl-2.0.txt RELNOTES README.*
|
|
|
+%doc LICENSE* README.*
|
|
|
%{_sbindir}/clockdiff
|
|
|
/sbin/arping
|
|
|
%{_sbindir}/arping
|
|
|
@@ -173,6 +163,13 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Nov 17 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20180629-1
|
|
|
+- updated to 20180629.
|
|
|
+- dropped Patch2-5 (fixed in upstream).
|
|
|
+- updated gettext patch and translation.
|
|
|
+- added BR:libxslt.
|
|
|
+- added BR:docbook-style-xsl.
|
|
|
+
|
|
|
* Sat Feb 24 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20161105-2
|
|
|
- fixed initscripts.
|
|
|
|
tomop