|
@@ -1,7 +1,7 @@
|
|
Summary: Network monitoring tools including ping.
|
|
Summary: Network monitoring tools including ping.
|
|
Summary(ja): ping 等のネットワークモニタツール集
|
|
Summary(ja): ping 等のネットワークモニタツール集
|
|
Name: iputils
|
|
Name: iputils
|
|
-Version: 20180629
|
|
+Version: 20190709
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
# some parts are under the original BSD (ping.c)
|
|
# some parts are under the original BSD (ping.c)
|
|
# some are under GPLv2+ (tracepath.c)
|
|
# some are under GPLv2+ (tracepath.c)
|
|
@@ -18,12 +18,10 @@ Source7: ninfod.sysconfig
|
|
Source10: bsd.txt
|
|
Source10: bsd.txt
|
|
Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
|
Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
|
|
|
|
|
-Patch0: iputils-rh.patch
|
|
|
|
Patch1: iputils-ifenslave.patch
|
|
Patch1: iputils-ifenslave.patch
|
|
|
|
|
|
# Vine Source(s)/Patch(es)
|
|
# Vine Source(s)/Patch(es)
|
|
-Source1000: iputils-s20180629-ja.po
|
|
+
|
|
-Patch1000: iputils-s20180629-gettext.patch
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRequires: docbook-utils perl-SGMLSpm
|
|
BuildRequires: docbook-utils perl-SGMLSpm
|
|
@@ -32,7 +30,8 @@ BuildRequires: libidn2-devel
|
|
BuildRequires: openssl-devel
|
|
BuildRequires: openssl-devel
|
|
BuildRequires: libcap-devel
|
|
BuildRequires: libcap-devel
|
|
BuildRequires: libxslt
|
|
BuildRequires: libxslt
|
|
-BuildRequires: docbook-style-xsl
|
|
+BuildRequires: docbook5-style-xsl
|
|
|
|
+BuildRequires: meson
|
|
Requires(post): chkconfig
|
|
Requires(post): chkconfig
|
|
Requires(preun): chkconfig
|
|
Requires(preun): chkconfig
|
|
Requires(preun): initscripts
|
|
Requires(preun): initscripts
|
|
@@ -52,15 +51,8 @@ the target machine is alive and receiving network traffic.
|
|
|
|
|
|
cp %{SOURCE10} %{SOURCE11} .
|
|
cp %{SOURCE10} %{SOURCE11} .
|
|
|
|
|
|
-%patch0 -p1
|
|
|
|
%patch1 -p1
|
|
%patch1 -p1
|
|
|
|
|
|
-#
|
|
|
|
-%patch1000 -p1 -b .gettext
|
|
|
|
-
|
|
|
|
-# add ja.po
|
|
|
|
-cp %{SOURCE1000} po/ja.po
|
|
|
|
-
|
|
|
|
%build
|
|
%build
|
|
%ifarch s390 s390x
|
|
%ifarch s390 s390x
|
|
export CFLAGS="$RPM_OPT_FLAGS -fPIE"
|
|
export CFLAGS="$RPM_OPT_FLAGS -fPIE"
|
|
@@ -69,10 +61,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fpie"
|
|
%endif
|
|
%endif
|
|
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
|
|
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
|
|
|
|
|
|
-make %{?_smp_mflags} arping clockdiff ping rdisc tracepath ninfod
|
|
+%meson
|
|
|
|
+%meson_build
|
|
|
|
+%ninja_build -C %{_target_platform} iputils-gmo
|
|
|
|
+
|
|
gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave
|
|
gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave
|
|
-make -C doc man
|
|
+
|
|
-make -C po
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
rm -rf ${RPM_BUILD_ROOT}
|
|
rm -rf ${RPM_BUILD_ROOT}
|
|
@@ -82,11 +76,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
|
|
mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin}
|
|
mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin}
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
|
|
|
|
|
|
|
+pushd %{_target_platform}
|
|
install -c clockdiff ${RPM_BUILD_ROOT}%{_sbindir}/
|
|
install -c clockdiff ${RPM_BUILD_ROOT}%{_sbindir}/
|
|
install -cp arping ${RPM_BUILD_ROOT}/sbin/
|
|
install -cp arping ${RPM_BUILD_ROOT}/sbin/
|
|
ln -s /sbin/arping ${RPM_BUILD_ROOT}%{_sbindir}/arping
|
|
ln -s /sbin/arping ${RPM_BUILD_ROOT}%{_sbindir}/arping
|
|
install -cp ping ${RPM_BUILD_ROOT}/bin/
|
|
install -cp ping ${RPM_BUILD_ROOT}/bin/
|
|
-install -cp ifenslave ${RPM_BUILD_ROOT}/sbin/
|
|
+install -cp ../ifenslave ${RPM_BUILD_ROOT}/sbin/
|
|
install -cp rdisc ${RPM_BUILD_ROOT}/sbin/
|
|
install -cp rdisc ${RPM_BUILD_ROOT}/sbin/
|
|
install -cp tracepath ${RPM_BUILD_ROOT}/bin/
|
|
install -cp tracepath ${RPM_BUILD_ROOT}/bin/
|
|
install -cp ninfod/ninfod ${RPM_BUILD_ROOT}/sbin/
|
|
install -cp ninfod/ninfod ${RPM_BUILD_ROOT}/sbin/
|
|
@@ -103,10 +98,14 @@ install -cp doc/ping.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
install -cp doc/rdisc.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
install -cp doc/rdisc.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
install -cp doc/tracepath.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
install -cp doc/tracepath.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
install -cp doc/ninfod.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
install -cp doc/ninfod.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
-install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
+install -cp ../ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
|
ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
|
|
ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
|
|
ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
|
|
ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
|
|
|
|
|
|
|
|
+install -dp ${RPM_BUILD_ROOT}%{_datadir}/locale/ja/LC_MESSAGES
|
|
|
|
+install -m 644 po/ja.gmo $RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/iputils.mo
|
|
|
|
+popd
|
|
|
|
+
|
|
find ${RPM_BUILD_ROOT}%{_mandir} -type f | xargs chmod 644
|
|
find ${RPM_BUILD_ROOT}%{_mandir} -type f | xargs chmod 644
|
|
|
|
|
|
install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
|
|
install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
|
|
@@ -115,8 +114,6 @@ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rdisc
|
|
install -m 755 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/ninfod
|
|
install -m 755 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/ninfod
|
|
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ninfod
|
|
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ninfod
|
|
|
|
|
|
-make -C po install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
-
|
|
|
|
%find_lang %{name}
|
|
%find_lang %{name}
|
|
|
|
|
|
%post
|
|
%post
|
|
@@ -143,7 +140,8 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
%files -f %{name}.lang
|
|
%files -f %{name}.lang
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%doc LICENSE* README.*
|
|
+%license LICENSE*
|
|
|
|
+%doc README.*
|
|
%{_sbindir}/clockdiff
|
|
%{_sbindir}/clockdiff
|
|
/sbin/arping
|
|
/sbin/arping
|
|
%{_sbindir}/arping
|
|
%{_sbindir}/arping
|
|
@@ -163,6 +161,12 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Tue Oct 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20190709-1
|
|
|
|
+- updated to 20190709.
|
|
|
|
+- dropped Source1000 and Patch1000: merged into upstream.
|
|
|
|
+- switched buildsystem to meson.
|
|
|
|
+- dropped Patch0: Makefile is deprecated.
|
|
|
|
+
|
|
* Sat Nov 17 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20180629-1
|
|
* Sat Nov 17 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20180629-1
|
|
- updated to 20180629.
|
|
- updated to 20180629.
|
|
- dropped Patch2-5 (fixed in upstream).
|
|
- dropped Patch2-5 (fixed in upstream).
|