diff --git a/ethtool.changes b/ethtool.changes index 4fa2e00..68d4121 100644 --- a/ethtool.changes +++ b/ethtool.changes @@ -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 diff --git a/ethtool.spec b/ethtool.spec index 2fe6ee4..3310797 100644 --- a/ethtool.spec +++ b/ethtool.spec @@ -1,7 +1,7 @@ # # 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 # 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} autoreconf -fi export CFLAGS="%{optflags} -W -Wall -Wstrict-prototypes -Wformat-security -Wpointer-arith" -%configure --sbindir=/sbin +%configure make %{?_smp_mflags} %install %make_install +#UsrMerge +mkdir $RPM_BUILD_ROOT/sbin +ln -sf %{_sbindir}/ethtool $RPM_BUILD_ROOT/sbin +#EndUserMerge %files %defattr(-,root,root) +#UsrMerge /sbin/ethtool +#EndUserMerge +%{_sbindir}/ethtool %{_mandir}/man8/ethtool.8* %doc AUTHORS COPYING NEWS README ChangeLog