From 7c5c54eb698e1077110efd6606c2e3e459857c2cfb3b9206f7518b27638f74bd Mon Sep 17 00:00:00 2001
From: OBS User mrdocs <null@suse.de>
Date: Sat, 18 Feb 2012 01:51:40 +0000
Subject: [PATCH] Accepting request 105600 from
 home:rjschwei:branches:network:utilities

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/105600
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=24
---
 iputils.changes |  5 ++++
 iputils.spec    | 72 ++++++++++++++++++++++++++++++-------------------
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/iputils.changes b/iputils.changes
index 7240fe3..4022590 100644
--- a/iputils.changes
+++ b/iputils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 17 00:36:48 UTC 2012 - rschweikert@suse.com
+
+- place binaries in /usr tree (UsrMerge project)
+
 -------------------------------------------------------------------
 Tue May 31 10:06:29 CEST 2011 - ms@suse.de
 
diff --git a/iputils.spec b/iputils.spec
index 410a972..48ede04 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package iputils (Version s20101006)
+# spec file for package iputils
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,11 +15,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           iputils
-BuildRequires:  docbook_3 iso_ent libopenssl-devel opensp perl-SGMLS
+BuildRequires:  docbook_3
+BuildRequires:  iso_ent
+BuildRequires:  libopenssl-devel
+BuildRequires:  opensp
+BuildRequires:  perl-SGMLS
 %if 0%{?suse_version} > 1130
 BuildRequires:  sysfsutils-devel
 %else
@@ -27,10 +29,10 @@ BuildRequires:  sysfsutils
 %endif
 BuildRequires:  libcap-devel
 Summary:        IPv4 and IPv6 Networking Utilities
-Version:        s20101006
-Release:        2
-License:        BSD3c ; GPLv2+
+License:        BSD-3-Clause ; GPL-2.0+
 Group:          Productivity/Networking/Other
+Version:        s20101006
+Release:        0
 Url:            http://www.skbuff.net/iputils
 Source:         http://www.skbuff.net/iputils/iputils-%{version}.tar.bz2
 # XXX: from linux/Documentation/networking/ifenslave.c
@@ -70,17 +72,29 @@ gcc $RPM_OPT_FLAGS -o ifenslave ifenslave.c
 make man
 
 %install
-mkdir -p $RPM_BUILD_ROOT%_sbindir
+mkdir -p $RPM_BUILD_ROOT/%_sbindir
+mkdir -p $RPM_BUILD_ROOT/%_bindir
+install arping		$RPM_BUILD_ROOT/%{_sbindir}
+install ifenslave	$RPM_BUILD_ROOT/%{_sbindir}
+install clockdiff	$RPM_BUILD_ROOT/%{_sbindir}
+install rdisc		$RPM_BUILD_ROOT/%{_sbindir}/in.rdisc
+install tracepath	$RPM_BUILD_ROOT/%{_sbindir}
+install tracepath6	$RPM_BUILD_ROOT/%{_sbindir}
+install ping		$RPM_BUILD_ROOT/%{_bindir}
+install ping6		$RPM_BUILD_ROOT/%{_bindir}
+install ipg			$RPM_BUILD_ROOT/%{_bindir}
+#UsrMerge
 mkdir -p $RPM_BUILD_ROOT/{bin,sbin}
-install arping			$RPM_BUILD_ROOT/sbin/
-install ifenslave		$RPM_BUILD_ROOT/sbin/
-install clockdiff		$RPM_BUILD_ROOT/sbin/
-install rdisc			$RPM_BUILD_ROOT/sbin/in.rdisc
-install ping			$RPM_BUILD_ROOT/bin
-install ping6			$RPM_BUILD_ROOT/bin
-install ipg			$RPM_BUILD_ROOT/bin
-install tracepath		$RPM_BUILD_ROOT/sbin
-install tracepath6		$RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/arping		$RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/ifenslave	$RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/clockdiff	$RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/in.rdisc		$RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/tracepath	$RPM_BUILD_ROOT/sbin
+ln -sf %{_sbindir}/tracepath6	$RPM_BUILD_ROOT/sbin
+ln -sf %{_bindir}/ping			$RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/ping6			$RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/ipg			$RPM_BUILD_ROOT/bin
+#EndUsrMerge
 mkdir -p $RPM_BUILD_ROOT%_mandir/man8
 install  -m 644 doc/arping.8		$RPM_BUILD_ROOT%_mandir/man8/
 install  -m 644 doc/clockdiff.8		$RPM_BUILD_ROOT%_mandir/man8/
@@ -102,15 +116,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc RELNOTES
-/sbin/arping
-/sbin/ifenslave
-/sbin/clockdiff
-%verify(not mode caps) %attr(4755,root,root) /bin/ping
-%verify(not mode caps) %attr(4755,root,root) /bin/ping6
-/bin/ipg
-/sbin/tracepath
-/sbin/tracepath6
-/sbin/in.rdisc
+%{_sbindir}/arping
+%{_sbindir}/ifenslave
+%{_sbindir}/clockdiff
+%verify(not mode caps) %attr(4755,root,root) %{_bindir}/ping
+%verify(not mode caps) %attr(4755,root,root) %{_bindir}/ping6
+%{_bindir}/ipg
+%{_sbindir}/tracepath
+%{_sbindir}/tracepath6
+%{_sbindir}/in.rdisc
+#UsrMerge
+/bin/*
+/sbin/*
+#EndUsrMerge
 %attr(644,root,root) %_mandir/man8/*
 
 %changelog