- timespec64 usage is kernel ver dependent and kcompat.h is not doing the trick

[packages/igb.git] / igb.spec

diff --git a/igb.spec b/igb.spec
index b1825d101ae43975d6b2afaf6e3d3459df25fb3e..7c3a463dd1d3eef1dbc27c4c9d7b8098cf5ca25a 100644 (file)
--- a/igb.spec
+++ b/igb.spec
@@ -1,41 +1,26 @@
 # Conditional build:
-%bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_with    verbose         # verbose build (V=1)
 
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
-%endif
-
-%define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
-%define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
-%define                ikpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%install_kernel_pkg ; done)
-
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
 %define                _duplicate_files_terminate_build        0
 
-%define                rel     3
+%define                rel     1
 %define                pname   igb
 Summary:       Intel(R) PRO/1000 driver for Linux
 Summary(pl.UTF-8):     Sterownik do karty Intel(R) PRO/1000
 Name:          %{pname}%{_alt_kernel}
-Version:       5.2.5
+Version:       5.3.2
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
-# Source0-md5: 7d7430f5a7151d39db038f4a75baa3b9
-Patch0:                linux-3.15.patch
+# Source0-md5: dbedbb2cefaf3fa09eb5a4912914cdac
+Patch0:                timespec64.patch
 URL:           http://sourceforge.net/projects/e1000/
-%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
-BuildRequires: rpm-build-macros >= 1.678
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires: rpm-build-macros >= 1.701
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,10 +38,8 @@ Summary(pl.UTF-8):   Sterownik do karty Intel(R) PRO/1000\
 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\
 \
 %description -n kernel%{_alt_kernel}-net-igb\
 This package contains the Linux driver for the Intel(R) PRO/1000\
@@ -94,7 +77,7 @@ alias igb igb-current\
 EOF\
 %{nil}
 
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -104,7 +87,7 @@ cat > src/Makefile <<'EOF'
 obj-m := igb.o
 igb-objs := igb_main.o e1000_82575.o e1000_i210.o e1000_mac.o e1000_nvm.o e1000_phy.o \
        e1000_manage.o igb_param.o igb_ethtool.o kcompat.o e1000_api.o \
-       e1000_mbx.o igb_vmdq.o igb_procfs.o igb_hwmon.o igb_ptp.o
+       e1000_mbx.o igb_vmdq.o igb_procfs.o igb_hwmon.o igb_ptp.o igb_debugfs.o
 
 EXTRA_CFLAGS += -DIGB_PTP
 EXTRA_CFLAGS += -DDRIVER_IGB
@@ -113,13 +96,13 @@ EXTRA_CFLAGS += -DDRIVER_NAME_CAPS=IGB
 EOF
 
 %build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_mandir}/man7
 
-%{expand:%ikpkg}
+%{expand:%install_kernel_packages}
 cp -a installed/* $RPM_BUILD_ROOT
 
 cp -a igb.7 $RPM_BUILD_ROOT%{_mandir}/man7