From 6373c0cad59402c11b209fd2aa5f1ffb09cd357e Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Sat, 7 Mar 2009 20:34:22 +0000
Subject: [PATCH] Upgrade to GIT 20090306

---
 .cvsignore                 |  1 -
 ethtool-6-help_usage.patch | 22 +++++++++++-----------
 ethtool-6-man_pages.patch  | 28 ----------------------------
 ethtool.spec               | 17 +++++++----------
 sources                    |  3 +--
 5 files changed, 19 insertions(+), 52 deletions(-)
 delete mode 100644 ethtool-6-man_pages.patch

diff --git a/.cvsignore b/.cvsignore
index 0c24f50..e633370 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
 ethtool-6.tar.gz
-gpl-2.0.txt
diff --git a/ethtool-6-help_usage.patch b/ethtool-6-help_usage.patch
index 45d9c81..b587167 100644
--- a/ethtool-6-help_usage.patch
+++ b/ethtool-6-help_usage.patch
@@ -2,16 +2,16 @@ Patch by Robert Scheck <robert@fedoraproject.org> for ethtool >= 6, which remove
 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-01-15 23:14:44.000000000 +0100
-+++ ethtool-6/ethtool.c.help_usage		2009-01-15 23:59:20.000000000 +0100
-@@ -201,8 +201,9 @@
+--- 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(stderr, "        ethtool %s|%s DEVNAME\t%s\n%s",
-+		fprintf(stderr, "        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 : "");
- 	}
+ 		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 : "");
+ 		}
diff --git a/ethtool-6-man_pages.patch b/ethtool-6-man_pages.patch
deleted file mode 100644
index eca3204..0000000
--- a/ethtool-6-man_pages.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Patch by Ben Hutchings <ben@decadent.org.uk> for ethtool >= 6, which fixes the
-wrong long name for the -p option in the man page (correct --identify rather the
-wrong --blink). And it removes some typos in man page. For further information,
-please have a look to Debian bug IDs #488067 and #506225).
-
---- ethtool-6/ethtool.8				2008-09-14 04:12:31.000000000 +0200
-+++ ethtool-6/ethtool.8.man_pages		2009-01-15 23:44:38.000000000 +0100
-@@ -158,7 +158,7 @@
- .B ethtool \-k|\-\-show\-offload
- .I ethX
- 
--.B ethtool \-K\-\-offload
-+.B ethtool \-K|\-\-offload
- .I ethX
- .B2 rx on off
- .B2 tx on off
-@@ -167,9 +167,9 @@
- .B2 ufo on off
- .B2 gso on off
- 
--.B ethtool \-p|\-\-blink
-+.B ethtool \-p|\-\-identify
- .I ethX
--.IR [ N ]
-+.RI [ N ]
- 
- .B ethtool \-r|\-\-negotiate
- .I ethX
diff --git a/ethtool.spec b/ethtool.spec
index 6aaf035..bcbecba 100644
--- a/ethtool.spec
+++ b/ethtool.spec
@@ -1,7 +1,7 @@
 Summary:	Ethernet settings tool for PCI ethernet cards
 Name:		ethtool
 Version:	6
-Release:	3.20090115git%{?dist}
+Release:	4.20090306git%{?dist}
 License:	GPLv2
 Group:		Applications/System
 URL:		http://sourceforge.net/projects/gkernel/
@@ -10,14 +10,12 @@ 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 2c4bd1c0c4d8112c16f9143da69c03d02ac3b1ae
+# - cd ethtool-6; git checkout 7336e8a6a587802ca72dcf5f509696d96b9d6f23
 # - 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
-Source1:	http://www.gnu.org/licenses/gpl-2.0.txt
-Patch0:		ethtool-6-man_pages.patch
-Patch1:		ethtool-6-help_usage.patch
+Patch0:		ethtool-6-help_usage.patch
 BuildRequires:	automake, autoconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,8 +26,7 @@ network devices, especially of ethernet devices.
 
 %prep
 %setup -q
-%patch0 -p1 -b .man_pages
-%patch1 -p1 -b .help_usage
+%patch0 -p1 -b .help_usage
 
 # Only needed when using upstream git
 aclocal
@@ -37,9 +34,6 @@ autoheader
 automake --gnu --add-missing --copy
 autoconf
 
-# Replace GPLvX from automake by GPLv2
-cp -f %{SOURCE1} COPYING
-
 %build
 %configure --sbindir=/sbin
 make %{?_smp_mflags}
@@ -63,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Sat Mar 07 2009 Robert Scheck <robert@fedoraproject.org> 6-4.20090306git
+- Upgrade to GIT 20090306
+
 * Mon Feb 23 2009 Robert Scheck <robert@fedoraproject.org> 6-3.20090115git
 - Rebuild for gcc 4.4 and rpm 4.6
 
diff --git a/sources b/sources
index 5f2e859..d6e1a70 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-462e8eb1a18a05007e183ebeed65bfd5  ethtool-6.tar.gz
-751419260aa954499f7abaabaa882bbe  gpl-2.0.txt
+efaf447b8bb746f7d989ed6a933b18b1  ethtool-6.tar.gz