Upgrade to GIT 20090323

ethtool-6-help_usage.patch

@@ -1,17 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for ethtool >= 6, which removes
-the bogus -h/--help usage stating, that DEVNAME is required for help. For further
-information, please have a look to Red Hat Bugzilla ID #472038.
-
---- ethtool-6/ethtool.c				2009-03-07 21:10:41.000000000 +0100
-+++ ethtool-6/ethtool.c.help_usage		2009-03-07 21:19:40.000000000 +0100
-@@ -213,8 +213,9 @@
- 		"Usage:\n"
- 		"ethtool DEVNAME\tDisplay standard information about device\n");
- 		for (i = 0; args[i].srt; i++) {
--			fprintf(stdout, "        ethtool %s|%s DEVNAME\t%s\n%s",
-+			fprintf(stdout, "        ethtool %s|%s %s\t%s\n%s",
- 				args[i].srt, args[i].lng,
-+				strstr(args[i].srt, "-h") ? "\t" : "DEVNAME",
- 				args[i].help,
- 				args[i].opthelp ? args[i].opthelp : "");
- 		}

ethtool.spec

@@ -1,6 +1,6 @@
 Name:		ethtool
 Version:	6
-Release:	5.20090306git%{?dist}
+Release:	6.20090323git%{?dist}
 Summary:	Ethernet settings tool for PCI ethernet cards
 
 License:	GPLv2
@@ -12,12 +12,11 @@ URL:		http://sourceforge.net/projects/gkernel/
 #
 # When generating tarball package from upstream git:
 # - git clone git://git.kernel.org/pub/scm/network/ethtool/ethtool.git ethtool-6
-# - cd ethtool-6; git checkout 7336e8a6a587802ca72dcf5f509696d96b9d6f23
+# - cd ethtool-6; git checkout 669ba5cadfb15842e90d8aa7ba5a575f7a457b3e
 # - cp -f ChangeLog ChangeLog.old; git log > ChangeLog.git
 # - rm -rf .git; cd ..; tar cvfz ethtool-6.tar.gz ethtool-6
 # - Use the visible date of latest git log entry for %{release} in spec file
 Source0:	%{name}-%{version}.tar.gz
-Patch0:		ethtool-6-help_usage.patch
 BuildRequires:	automake, autoconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,7 +27,6 @@ network devices, especially of ethernet devices.
 
 %prep
 %setup -q
-%patch0 -p1 -b .help_usage
 
 # Only needed when using upstream git
 aclocal
@@ -59,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Sat Jul 18 2009 Robert Scheck <robert@fedoraproject.org> 6-6.20090323git
+- Upgrade to GIT 20090323
+
 * Thu Jul 16 2009 Jeff Garzik <jgarzik@redhat.com> 6-5.20090306git
 - minor specfile cleanups
 

sources

@@ -1 +1 @@
-efaf447b8bb746f7d989ed6a933b18b1  ethtool-6.tar.gz
+4995625a2fcb0953b6b446034eb9eed9  ethtool-6.tar.gz