toybox: fix iputils binary path

Change-Id: Id85cd0d3d3081a6396516be5100d98602c0b3ce6 Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com> Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/20120 Reviewed-by: Tapas Kundu <tkundu@vmware.com> Tested-by: Tapas Kundu <tkundu@vmware.com>
vmware · Mar 29, 2023 · acf6c69 · acf6c69
1 parent 4c11f86
commit acf6c69
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/SPECS/toybox/toybox.spec b/SPECS/toybox/toybox.spec
@@ -4,7 +4,7 @@
 
 Name:           toybox
 Version:        0.8.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        BSD
 Summary:        Common Linux command line utilities in a single executable
 Url:            http://landley.net/toybox
@@ -13,7 +13,7 @@ Vendor:         VMware, Inc.
 Distribution:   Photon
 
 Source0: http://landley.net/toybox/downloads/%{name}-%{version}.tar.gz
-%define sha512  %{name}=73a3ec2a0d69b1566e1663e94b2bc7764b9f93e53978725f036f066837ab2769033e8bf17d5550e565656781cacf27d93960dd611ffed5425fa006d1d3104351
+%define sha512 %{name}=73a3ec2a0d69b1566e1663e94b2bc7764b9f93e53978725f036f066837ab2769033e8bf17d5550e565656781cacf27d93960dd611ffed5425fa006d1d3104351
 
 Patch0: %{name}-change-toys-path.patch
 
@@ -56,7 +56,6 @@ PREFIX=%{buildroot} make install %{?_smp_mflags}
 mv %{buildroot}/bin/* %{buildroot}%{_bindir}
 mv %{buildroot}/sbin/* %{buildroot}%{_sbindir}
 mv %{buildroot}%{_sbindir}/{ifconfig,lspci} %{buildroot}%{_bindir}
-mv %{buildroot}%{_bindir}/ping6 %{buildroot}%{_sbindir}
 chmod 755 %{buildroot}%{_bindir}/%{name}
 install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}-toys
 
@@ -321,7 +320,7 @@ mktoy %{_sbindir}/iotop
 %triggerpostun -- iputils
 [ $2 -eq 0 ] || exit 0
 %{_mktoy_}
-mktoy %{_bindir}/ping %{_sbindir}/ping6
+mktoy %{_bindir}/ping %{_bindir}/ping6
 
 %triggerpostun -- kbd
 [ $2 -eq 0 ] || exit 0
@@ -577,7 +576,7 @@ mktoy %{_bindir}/which
 
 # iputils
 %ghost %{_bindir}/ping
-%ghost %{_sbindir}/ping6
+%ghost %{_bindir}/ping6
 
 # kbd
 %ghost %{_bindir}/chvt
@@ -707,6 +706,8 @@ mktoy %{_bindir}/which
 %doc README LICENSE
 
 %changelog
+* Tue Mar 28 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.8.9-3
+- Fix iputils provided binary path
 * Thu Mar 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.8.9-2
 - Require openssl-libs
 * Mon Mar 06 2023 Harinadh D <hdommaraju@vmware.com> 0.8.9-1