Hello community,
here is the log from the commit of package ethtool for openSUSE:Factory checked
in at 2012-02-10 17:13:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ethtool (Old)
and /work/SRC/openSUSE:Factory/.ethtool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ethtool", Maintainer is "pu...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ethtool/ethtool.changes 2011-12-14
14:33:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ethtool.new/ethtool.changes 2012-02-10
17:13:28.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Feb 8 13:00:21 UTC 2012 - rschweik...@suse.com
+
+- keep binary in /usr tree (UsrMerge project)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ethtool.spec ++++++
--- /var/tmp/diff_new_pack.9hA6UP/_old 2012-02-10 17:13:31.000000000 +0100
+++ /var/tmp/diff_new_pack.9hA6UP/_new 2012-02-10 17:13:31.000000000 +0100
@@ -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 @@
%{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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
