[packages/r8168] - updated to 8.039.00
baggins
baggins at pld-linux.org
Wed Jan 28 18:51:06 CET 2015
commit 8972ff33d49c4957b61de57bce5d671f2c21c018
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Jan 28 18:50:55 2015 +0100
- updated to 8.039.00
linux-3.15.patch | 14 --------------
linux-3.16.patch | 14 --------------
r8168.spec | 10 +++-------
3 files changed, 3 insertions(+), 35 deletions(-)
---
diff --git a/r8168.spec b/r8168.spec
index 6f1c8f4..448442f 100644
--- a/r8168.spec
+++ b/r8168.spec
@@ -4,12 +4,12 @@
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%define rel 3
+%define rel 1
%define pname r8168
Summary: Linux driver for RTL8111/8168B PCI Express Gigabit Ethernet controllers
Summary(pl.UTF-8): Linuksowy sterownik dla kart sieciowych RTL8111/8168B PCI Express Gigabit Ethernet
Name: %{pname}%{_alt_kernel}
-Version: 8.038.00
+Version: 8.039.00
Release: %{rel}%{?_pld_builder:@%{_kernel_ver_str}}
License: GPL
Group: Base/Kernel
@@ -18,9 +18,7 @@ URL: http://www.realtek.com.tw/
# http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false
# unfortunately this download is not DF-friendly.
Source0: %{pname}-%{version}.tar.bz2
-# Source0-md5: fe2962824587070a2ec53f77e40b0fea
-Patch0: linux-3.15.patch
-Patch1: linux-3.16.patch
+# Source0-md5: 98314a558a4c667d7652d5dbdd0f0579
BuildRequires: rpmbuild(macros) >= 1.701
%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
@@ -72,8 +70,6 @@ Express Gigabit Ethernet.\
%prep
%setup -q -n %{pname}-%{version}
-%patch0 -p1
-%patch1 -p1
%build
%{expand:%build_kernel_packages}
diff --git a/linux-3.15.patch b/linux-3.15.patch
deleted file mode 100644
index ee5ba05..0000000
--- a/linux-3.15.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- r8168-8.038.00/src/r8168_n.c~ 2014-01-08 09:56:43.000000000 +0100
-+++ r8168-8.038.00/src/r8168_n.c 2014-07-10 22:02:50.895076111 +0200
-@@ -19119,7 +19119,11 @@
- {
- struct rtl8168_private *tp = netdev_priv(dev);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
- PREPARE_DELAYED_WORK(&tp->task, task);
-+#else
-+ INIT_DELAYED_WORK(&tp->task, task);
-+#endif
- schedule_delayed_work(&tp->task, 4);
- }
- #endif
diff --git a/linux-3.16.patch b/linux-3.16.patch
deleted file mode 100644
index 6a23eee..0000000
--- a/linux-3.16.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- r8168-8.038.00/src/r8168_n.c~ 2014-08-25 22:58:24.000000000 +0200
-+++ r8168-8.038.00/src/r8168_n.c 2014-08-25 23:00:52.314799987 +0200
-@@ -17542,7 +17542,11 @@
-
- RTL_NET_DEVICE_OPS(rtl8168_netdev_ops);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)
- SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops);
-+#else
-+ dev->ethtool_ops = &rtl8168_ethtool_ops;
-+#endif
-
- dev->watchdog_timeo = RTL8168_TX_TIMEOUT;
- dev->irq = pdev->irq;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/r8168.git/commitdiff/8972ff33d49c4957b61de57bce5d671f2c21c018
More information about the pld-cvs-commit
mailing list