Accepting request 103408 from network:utilities

- keep binary in /usr tree (UsrMerge project)

OBS-URL: https://build.opensuse.org/request/show/103408
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ethtool?expand=0&rev=23
This commit is contained in:
Stephan Kulow 2012-02-10 16:13:22 +00:00 committed by Git OBS Bridge
commit d36d38fb33
2 changed files with 14 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 8 13:00:21 UTC 2012 - rschweikert@suse.com
- keep binary in /usr tree (UsrMerge project)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 13 11:10:07 UTC 2011 - puzel@suse.com Tue Dec 13 11:10:07 UTC 2011 - puzel@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ethtool # spec file for package ethtool
# #
# 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 # 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
@ -38,15 +38,22 @@ network interfaces. See the man page for more details.
%{suse_update_config -f} %{suse_update_config -f}
autoreconf -fi autoreconf -fi
export CFLAGS="%{optflags} -W -Wall -Wstrict-prototypes -Wformat-security -Wpointer-arith" export CFLAGS="%{optflags} -W -Wall -Wstrict-prototypes -Wformat-security -Wpointer-arith"
%configure --sbindir=/sbin %configure
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%make_install %make_install
#UsrMerge
mkdir $RPM_BUILD_ROOT/sbin
ln -sf %{_sbindir}/ethtool $RPM_BUILD_ROOT/sbin
#EndUserMerge
%files %files
%defattr(-,root,root) %defattr(-,root,root)
#UsrMerge
/sbin/ethtool /sbin/ethtool
#EndUserMerge
%{_sbindir}/ethtool
%{_mandir}/man8/ethtool.8* %{_mandir}/man8/ethtool.8*
%doc AUTHORS COPYING NEWS README ChangeLog %doc AUTHORS COPYING NEWS README ChangeLog