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
This commit is contained in:
OBS User mrdocs 2012-02-18 01:51:40 +00:00 committed by Git OBS Bridge
parent 0a8402914a
commit 7c5c54eb69
2 changed files with 50 additions and 27 deletions

View File

@ -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 Tue May 31 10:06:29 CEST 2011 - ms@suse.de

View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,11 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: iputils 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 %if 0%{?suse_version} > 1130
BuildRequires: sysfsutils-devel BuildRequires: sysfsutils-devel
%else %else
@ -27,10 +29,10 @@ BuildRequires: sysfsutils
%endif %endif
BuildRequires: libcap-devel BuildRequires: libcap-devel
Summary: IPv4 and IPv6 Networking Utilities Summary: IPv4 and IPv6 Networking Utilities
Version: s20101006 License: BSD-3-Clause ; GPL-2.0+
Release: 2
License: BSD3c ; GPLv2+
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
Version: s20101006
Release: 0
Url: http://www.skbuff.net/iputils Url: http://www.skbuff.net/iputils
Source: http://www.skbuff.net/iputils/iputils-%{version}.tar.bz2 Source: http://www.skbuff.net/iputils/iputils-%{version}.tar.bz2
# XXX: from linux/Documentation/networking/ifenslave.c # XXX: from linux/Documentation/networking/ifenslave.c
@ -70,17 +72,29 @@ gcc $RPM_OPT_FLAGS -o ifenslave ifenslave.c
make man make man
%install %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} mkdir -p $RPM_BUILD_ROOT/{bin,sbin}
install arping $RPM_BUILD_ROOT/sbin/ ln -sf %{_sbindir}/arping $RPM_BUILD_ROOT/sbin
install ifenslave $RPM_BUILD_ROOT/sbin/ ln -sf %{_sbindir}/ifenslave $RPM_BUILD_ROOT/sbin
install clockdiff $RPM_BUILD_ROOT/sbin/ ln -sf %{_sbindir}/clockdiff $RPM_BUILD_ROOT/sbin
install rdisc $RPM_BUILD_ROOT/sbin/in.rdisc ln -sf %{_sbindir}/in.rdisc $RPM_BUILD_ROOT/sbin
install ping $RPM_BUILD_ROOT/bin ln -sf %{_sbindir}/tracepath $RPM_BUILD_ROOT/sbin
install ping6 $RPM_BUILD_ROOT/bin ln -sf %{_sbindir}/tracepath6 $RPM_BUILD_ROOT/sbin
install ipg $RPM_BUILD_ROOT/bin ln -sf %{_bindir}/ping $RPM_BUILD_ROOT/bin
install tracepath $RPM_BUILD_ROOT/sbin ln -sf %{_bindir}/ping6 $RPM_BUILD_ROOT/bin
install tracepath6 $RPM_BUILD_ROOT/sbin ln -sf %{_bindir}/ipg $RPM_BUILD_ROOT/bin
#EndUsrMerge
mkdir -p $RPM_BUILD_ROOT%_mandir/man8 mkdir -p $RPM_BUILD_ROOT%_mandir/man8
install -m 644 doc/arping.8 $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/ install -m 644 doc/clockdiff.8 $RPM_BUILD_ROOT%_mandir/man8/
@ -102,15 +116,19 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc RELNOTES %doc RELNOTES
/sbin/arping %{_sbindir}/arping
/sbin/ifenslave %{_sbindir}/ifenslave
/sbin/clockdiff %{_sbindir}/clockdiff
%verify(not mode caps) %attr(4755,root,root) /bin/ping %verify(not mode caps) %attr(4755,root,root) %{_bindir}/ping
%verify(not mode caps) %attr(4755,root,root) /bin/ping6 %verify(not mode caps) %attr(4755,root,root) %{_bindir}/ping6
/bin/ipg %{_bindir}/ipg
/sbin/tracepath %{_sbindir}/tracepath
/sbin/tracepath6 %{_sbindir}/tracepath6
/sbin/in.rdisc %{_sbindir}/in.rdisc
#UsrMerge
/bin/*
/sbin/*
#EndUsrMerge
%attr(644,root,root) %_mandir/man8/* %attr(644,root,root) %_mandir/man8/*
%changelog %changelog