From f115ec57bb2fabd60db2dbf7ee84546698bffb46 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:35:17 +0100 Subject: [PATCH] remove *domainname files provides by yp-tools and require yp-tools [release 2.10-2mamba;Sun Apr 11 2021] --- net-tools.spec | 57 +++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/net-tools.spec b/net-tools.spec index 9c8d54f..849ea0e 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,6 +1,6 @@ Name: net-tools Version: 2.10 -Release: 1mamba +Release: 2mamba Summary: The basic tools for setting up networking. Group: Applications/Networking Vendor: openmamba @@ -22,8 +22,9 @@ License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel ## AUTOBUILDREQ-END +Requires: yp-tools Requires: inetutils -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Provides: /bin/hostname %description The net-tools package contains the basic tools needed for setting up networking: ifconfig, netstat, route and others. @@ -44,52 +45,56 @@ _EOF #cp %{SOURCE1} ./config.in yes "" | make \ + BINDIR=%{_bindir} \ + SBINDIR=%{_sbindir} \ CC=%{_target_platform}-gcc \ AR=%{_target_platform}-ar - %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall \ + BINDIR=%{_bindir} \ + SBINDIR=%{_sbindir} \ CC=%{_target_platform}-gcc \ AR=%{_target_platform}-ar # compatibility symlinks -ln -sf ../bin/route %{buildroot}/sbin/route -ln -sf ../bin/ifconfig %{buildroot}/sbin/ifconfig +ln -sf ../bin/route %{buildroot}%{_sbindir}/route +ln -sf ../bin/ifconfig %{buildroot}%{_sbindir}/ifconfig + +# the following is provided by yp-tools +rm %{buildroot}%{_bindir}/{,nis,yp}domainname +rm -f %{buildroot}%{_mandir}/man1/{,nis,yp}domainname* %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %files %defattr(-,root,root) -/bin/dnsdomainname -/bin/domainname -/bin/hostname -/bin/ifconfig -/bin/netstat -/bin/nisdomainname -/bin/ypdomainname -/bin/route -/sbin/arp -/sbin/ifconfig -/sbin/ipmaddr -/sbin/iptunnel -/sbin/mii-tool -/sbin/nameif -/sbin/plipconfig -/sbin/rarp -/sbin/route -/sbin/slattach +%{_bindir}/dnsdomainname +%{_bindir}/hostname +%{_bindir}/ifconfig +%{_bindir}/netstat +%{_bindir}/route +%{_sbindir}/arp +%{_sbindir}/ifconfig +%{_sbindir}/ipmaddr +%{_sbindir}/iptunnel +%{_sbindir}/mii-tool +%{_sbindir}/nameif +%{_sbindir}/plipconfig +%{_sbindir}/rarp +%{_sbindir}/route +%{_sbindir}/slattach %{_mandir}/man1/dnsdomainname.* -%{_mandir}/man1/domainname.* -%{_mandir}/man1/nisdomainname.* -%{_mandir}/man1/ypdomainname.* %{_mandir}/man1/hostname.1* %{_mandir}/man5/* %{_mandir}/man8/* %changelog +* Sun Apr 11 2021 Silvan Calarco 2.10-2mamba +- remove *domainname files provides by yp-tools and require yp-tools + * Mon Jan 25 2021 Automatic Build System 2.10-1mamba - automatic version update by autodist