Accepting request 541566 from network:utilities

OBS-URL: https://build.opensuse.org/request/show/541566
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iputils?expand=0&rev=38

iputils.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 13 17:24:40 UTC 2017 - mpluskal@suse.com
+
+- Cleanup with spec-cleaner
+
 -------------------------------------------------------------------
 Thu Sep  7 19:27:48 UTC 2017 - pvorel@suse.cz
 

iputils.spec

@@ -17,28 +17,28 @@
 
 
 Name:           iputils
-BuildRequires:  docbook_3
-BuildRequires:  iso_ent
-BuildRequires:  libcap-devel
-BuildRequires:  libopenssl-devel
-BuildRequires:  opensp
-BuildRequires:  perl-SGMLS
-BuildRequires:  pkgconfig(libidn)
-# For Makefile modifications
-BuildRequires:  sed
-Summary:        IPv4 and IPv6 Networking Utilities
-License:        BSD-3-Clause and GPL-2.0+
-Group:          Productivity/Networking/Other
 Version:        s20161105
 Release:        0
+Summary:        IPv4 and IPv6 Networking Utilities
+License:        BSD-3-Clause AND GPL-2.0+
+Group:          Productivity/Networking/Other
 Url:            https://github.com/iputils/iputils
 Source:         https://github.com/iputils/iputils/archive/%{version}.tar.gz
 Patch8:         iputils-sec-ping-unblock.diff
 Patch9:         iputils-ping-interrupt.diff
 # PATCH-FIX-UPSTREAM iputils-remove-bogus-check-required-for-2.4.9-kernels.patch tiwai@suse.de - boo#927831
 Patch10:        iputils-remove-bogus-check-required-for-2.4.9-kernels.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  docbook_3
-PreReq:         permissions
+BuildRequires:  iso_ent
+BuildRequires:  libcap-devel
+BuildRequires:  libopenssl-devel
+BuildRequires:  opensp
+BuildRequires:  perl-SGMLS
+BuildRequires:  pkgconfig
+# For Makefile modifications
+BuildRequires:  sed
+BuildRequires:  pkgconfig(libidn)
+Requires(pre):  permissions
 # I have spotted at least two packages (yast-printer and dhcp-client) that need
 # /bin/ping and /sbin/arping but they do not seem to use them with absolute
 # paths so we may be lukcy and no further changes are necessary.
@@ -71,42 +71,40 @@ export LDFLAGS='-pie -Wl,-z,relro,-z,now'
 
 # Build only selected apps
 make %{?_smp_mflags} arping clockdiff ping rdisc tracepath \
-	rarpd
+	rarpd man
-make man
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%_sbindir
+mkdir -p %{buildroot}/%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT/%_bindir
+mkdir -p %{buildroot}/%{_bindir}
-install arping		$RPM_BUILD_ROOT/%{_sbindir}
+install arping		%{buildroot}/%{_sbindir}
-install clockdiff	$RPM_BUILD_ROOT/%{_sbindir}
+install clockdiff	%{buildroot}/%{_sbindir}
-install rdisc		$RPM_BUILD_ROOT/%{_sbindir}/in.rdisc
+install rdisc		%{buildroot}/%{_sbindir}/in.rdisc
 # boo#795788
-install tracepath	$RPM_BUILD_ROOT/%{_bindir}
+install tracepath	%{buildroot}/%{_bindir}
-install ping		$RPM_BUILD_ROOT/%{_bindir}
+install ping		%{buildroot}/%{_bindir}
 # boo#1017616
-ln -sf %{_bindir}/ping $RPM_BUILD_ROOT/%{_bindir}/ping6
+ln -sf %{_bindir}/ping %{buildroot}/%{_bindir}/ping6
-ln -sf %{_bindir}/tracepath $RPM_BUILD_ROOT/%{_bindir}/tracepath6
+ln -sf %{_bindir}/tracepath %{buildroot}/%{_bindir}/tracepath6
 
-#install rarpd       $RPM_BUILD_ROOT/%{_bindir}
 #UsrMerge
 # We still have reverse dependencies using /sbin/* or /bin/*
 # so keep these symlinks for now. They are slowly being fixed
 # but lets not just break them yet.
-mkdir -p $RPM_BUILD_ROOT/{bin,sbin}
+mkdir -p %{buildroot}/{bin,sbin}
-ln -sf %{_sbindir}/arping       $RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/arping       %{buildroot}/sbin
-ln -sf %{_sbindir}/clockdiff    $RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/clockdiff    %{buildroot}/sbin
-ln -sf %{_sbindir}/in.rdisc     $RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/in.rdisc     %{buildroot}/sbin
-ln -sf %{_bindir}/tracepath    $RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/tracepath     %{buildroot}/bin
-ln -sf %{_bindir}/ping          $RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/ping          %{buildroot}/bin
-ln -sf %{_bindir}/ping6         $RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/ping6         %{buildroot}/bin
-ln -sf %{_bindir}/tracepath6    $RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/tracepath6    %{buildroot}/bin
 #EndUsrMerge
 
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
+mkdir -p %{buildroot}/%{_mandir}/man8
 # Remove conflicting manpages
 rm doc/tftpd* doc/traceroute* doc/rarpd*
 # Install the rest
-install  -m 644 doc/*.8		$RPM_BUILD_ROOT%_mandir/man8/
+install  -m 644 doc/*.8		%{buildroot}%{_mandir}/man8/
 
 %post
 %set_permissions %{_bindir}/ping
@@ -115,17 +113,15 @@ install  -m 644 doc/*.8		$RPM_BUILD_ROOT%_mandir/man8/
 %verify_permissions -e %{_bindir}/ping
 
 %files
-%defattr(-,root,root)
 %doc RELNOTES
 %verify(not mode) %attr(0755,root,root) %{_bindir}/ping
 %{_bindir}/ping6
-#%{_bindir}/rarpd
 %{_sbindir}/arping
 %{_sbindir}/clockdiff
 %{_bindir}/tracepath
 %{_bindir}/tracepath6
 %{_sbindir}/in.rdisc
-%attr(644,root,root) %_mandir/man8/*
+%{_mandir}/man8/*
 #UsrMerge
 /bin/*
 /sbin/*