X-Git-Url: http://git.pld-linux.org/?p=packages%2Fr8168.git;a=blobdiff_plain;f=r8168.spec;h=4725114e446dda12de46bd13098a3397e48b060e;hp=a4968310eb76dd18e6b33aebc49e00d152e48b77;hb=HEAD;hpb=01fbed6141b64c35ed0f1c35ccef064a1d522fcc

diff --git a/r8168.spec b/r8168.spec
index a496831..0b2feef 100644
--- a/r8168.spec
+++ b/r8168.spec
@@ -1,37 +1,27 @@
-# NOTE:
-# - if you want to use it with ltm kernel, use LINUX_2_6_27 branch
-#
 # Conditional build:
-%bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	kernel		# don't build kernel modules
 %bcond_with	verbose		# verbose build (V=1)
 
-%if %{without kernel}
-%undefine	with_dist_kernel
-%endif
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
 
-%define		rel	8
+%define		rel	2
 %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.035.00
-Release:	%{rel}
+Version:	8.052.01
+Release:	%{rel}%{?_pld_builder:@%{_kernel_ver_str}}
 License:	GPL
 Group:		Base/Kernel
 URL:		http://www.realtek.com.tw/
 # Check for new versions at
-# http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false
+# https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
 # unfortunately this download is not DF-friendly.
 Source0:	%{pname}-%{version}.tar.bz2
-# Source0-md5:	80b8d23e463e5408dced1b1377579dae
-Patch0:		linux-3.8.patch
-%if %{with kernel}
-%if %{with dist_kernel}
-BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.33
-%endif
-BuildRequires:	rpmbuild(macros) >= 1.379
-%endif
+# Source0-md5:	31d41df8c9234d187d42b881a087d7df
+Patch0:		kernel-strcpy.patch
+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)
 
 %description
@@ -42,52 +32,55 @@ Ethernet controllers.
 Sterownik (moduł jądra Linuksa) dla kart sieciowych RTL8111/8168B PCI
 Express Gigabit Ethernet.
 
-%package -n kernel%{_alt_kernel}-net-r8168
-Summary:	Linux kernel module for RTL8111/8168B PCI Express Gigabit Ethernet controllers
-Summary(pl.UTF-8):	Moduł jądra Linuksa dla kart sieciowych RTL8111/8168B PCI Express Gigabit Ethernet
-Release:	%{rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun):	%releq_kernel
-%endif
+%define	kernel_pkg()\
+%package -n kernel%{_alt_kernel}-net-r8168\
+Summary:	Linux kernel module for RTL8111/8168B PCI Express Gigabit Ethernet controllers\
+Summary(pl.UTF-8):	Moduł jądra Linuksa dla kart sieciowych RTL8111/8168B PCI Express Gigabit Ethernet\
+Release:	%{rel}@%{_kernel_ver_str}\
+Group:		Base/Kernel\
+Requires(post,postun):	/sbin/depmod\
+%requires_releq_kernel\
+Requires(postun):	%releq_kernel\
+\
+%description -n kernel%{_alt_kernel}-net-r8168\
+Driver (Linux kernel module) for RTL8111/8168B PCI Express Gigabit\
+Ethernet controllers.\
+\
+%description -n kernel%{_alt_kernel}-net-r8168 -l pl.UTF-8\
+Sterownik (moduł jądra Linuksa) dla kart sieciowych RTL8111/8168B PCI\
+Express Gigabit Ethernet.\
+\
+%files -n kernel%{_alt_kernel}-net-r8168\
+%defattr(644,root,root,755)\
+%doc README\
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/*.ko*\
+\
+%post	-n kernel%{_alt_kernel}-net-r8168\
+%depmod %{_kernel_ver}\
+\
+%postun	-n kernel%{_alt_kernel}-net-r8168\
+%depmod %{_kernel_ver}\
+%{nil}
 
-%description -n kernel%{_alt_kernel}-net-r8168
-Driver (Linux kernel module) for RTL8111/8168B PCI Express Gigabit
-Ethernet controllers.
+%define build_kernel_pkg()\
+%build_kernel_modules -m r8168 -C src KERNELRELEASE=%{_kernel_ver}\
+%install_kernel_modules -D installed -m src/r8168 -d kernel/drivers/net\
+%{nil}
 
-%description -n kernel%{_alt_kernel}-net-r8168 -l pl.UTF-8
-Sterownik (moduł jądra Linuksa) dla kart sieciowych RTL8111/8168B PCI
-Express Gigabit Ethernet.
+%{expand:%create_kernel_packages}
 
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
 
 %build
-%if %{with kernel}
-%build_kernel_modules -m r8168 -C src KERNELRELEASE=%{_kernel_ver}
-%endif
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if %{with kernel}
-%install_kernel_modules -m src/r8168 -d kernel/drivers/net
-%endif
+install -d $RPM_BUILD_ROOT
+
+cp -a installed/* $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
-%post	-n kernel%{_alt_kernel}-net-r8168
-%depmod %{_kernel_ver}
-
-%postun	-n kernel%{_alt_kernel}-net-r8168
-%depmod %{_kernel_ver}
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-net-r8168
-%defattr(644,root,root,755)
-%doc README
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/*.ko*
-%endif