rpms/ethtool/devel .cvsignore, 1.11, 1.12 ethtool-6-help_usage.patch, 1.1, 1.2 ethtool.spec, 1.21, 1.22 sources, 1.11, 1.12 ethtool-6-man_pages.patch, 1.1, NONE
Robert Scheck
robert at fedoraproject.org
Sat Mar 7 20:34:53 UTC 2009
- Previous message (by thread): rpms/perl-Digest-MD4/devel perl-Digest-MD4.spec,1.8,1.9
- Next message (by thread): rpms/perl-App-Cache/devel import.log, NONE, 1.1 perl-App-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: robert
Update of /cvs/pkgs/rpms/ethtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6452
Modified Files:
.cvsignore ethtool-6-help_usage.patch ethtool.spec sources
Removed Files:
ethtool-6-man_pages.patch
Log Message:
Upgrade to GIT 20090306
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 17 Jan 2009 13:20:13 -0000 1.11
+++ .cvsignore 7 Mar 2009 20:34:22 -0000 1.12
@@ -1,2 +1 @@
ethtool-6.tar.gz
-gpl-2.0.txt
ethtool-6-help_usage.patch:
Index: ethtool-6-help_usage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/devel/ethtool-6-help_usage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ethtool-6-help_usage.patch 17 Jan 2009 13:20:13 -0000 1.1
+++ ethtool-6-help_usage.patch 7 Mar 2009 20:34:22 -0000 1.2
@@ -2,16 +2,16 @@
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 : "");
+ }
Index: ethtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/devel/ethtool.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ethtool.spec 23 Feb 2009 20:20:30 -0000 1.21
+++ ethtool.spec 7 Mar 2009 20:34:22 -0000 1.22
@@ -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 @@
#
# 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 @@
%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 @@
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 @@
%{_mandir}/man8/%{name}.8*
%changelog
+* Sat Mar 07 2009 Robert Scheck <robert at fedoraproject.org> 6-4.20090306git
+- Upgrade to GIT 20090306
+
* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 6-3.20090115git
- Rebuild for gcc 4.4 and rpm 4.6
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 17 Jan 2009 13:20:13 -0000 1.11
+++ sources 7 Mar 2009 20:34:22 -0000 1.12
@@ -1,2 +1 @@
-462e8eb1a18a05007e183ebeed65bfd5 ethtool-6.tar.gz
-751419260aa954499f7abaabaa882bbe gpl-2.0.txt
+efaf447b8bb746f7d989ed6a933b18b1 ethtool-6.tar.gz
--- ethtool-6-man_pages.patch DELETED ---
- Previous message (by thread): rpms/perl-Digest-MD4/devel perl-Digest-MD4.spec,1.8,1.9
- Next message (by thread): rpms/perl-App-Cache/devel import.log, NONE, 1.1 perl-App-Cache.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list