Hello community,

here is the log from the commit of package iputils for openSUSE:Factory checked 
in at 2012-02-21 07:31:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/iputils (Old)
 and      /work/SRC/openSUSE:Factory/.iputils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "iputils", Maintainer is "m...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/iputils/iputils.changes  2011-09-23 
02:03:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.iputils.new/iputils.changes     2012-02-21 
07:31:47.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Feb 17 00:36:48 UTC 2012 - rschweik...@suse.com
+
+- place binaries in /usr tree (UsrMerge project)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ iputils.spec ++++++
--- /var/tmp/diff_new_pack.tt9DRn/_old  2012-02-21 07:31:48.000000000 +0100
+++ /var/tmp/diff_new_pack.tt9DRn/_new  2012-02-21 07:31:48.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package iputils
 #
-# Copyright (c) 2011 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 @@
 %endif
 BuildRequires:  libcap-devel
 Summary:        IPv4 and IPv6 Networking Utilities
-Version:        s20101006
-Release:        10
 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 @@
 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 @@
 %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

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to