- no more sparc->sparc64

[packages/e1000.git] / e1000.spec

diff --git a/e1000.spec b/e1000.spec
index d122fb77fcb9d9e8a3cc767878e3e8734fcd10ba..7af5a1aafa11b6a4a06e63efd3446978c837e529 100644 (file)
--- a/e1000.spec
+++ b/e1000.spec
@@ -7,14 +7,14 @@
 Summary:       Intel(R) PRO/1000 driver for Linux
 Summary(pl):   Sterownik do karty Intel(R) PRO/1000
 Name:          kernel-net-e1000
-Version:       6.0.60
+Version:       6.2.15
 %define                _rel    1
 Release:       %{_rel}@%{_kernel_ver_str}
 License:       GPL v2
 Vendor:                Intel Corporation
 Group:         Base/Kernel
-Source0:       ftp://aiedownload.intel.com/df-support/2897/eng/e1000-%{version}.tar.gz
-# Source0-md5: 3787ae0bebc305e84356185492312e8a
+Source0:       ftp://aiedownload.intel.com/df-support/9180/eng/e1000-%{version}.tar.gz
+# Source0-md5: 83f16b6b3f255730e0649f23cfc01509
 URL:           http://support.intel.com/support/network/adapter/index.htm#PRO/1000
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
 BuildRequires: rpmbuild(macros) >= 1.211
@@ -71,7 +71,17 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        install -d include/{linux,config}
        ln -sf %{_kernelsrcdir}/config-$cfg .config
        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
+%ifarch ppc
+       if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then
+               install -d include/asm
+               cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
+               cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
+       else
+               ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+       fi
+%else
        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%endif
        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
        touch include/config/MARKER
 
@@ -85,8 +95,12 @@ EOF
                M=$PWD O=$PWD \
                %{?with_verbose:V=1}
        %{__make} -C %{_kernelsrcdir} modules \
+%if "%{_target_base_arch}" != "%{_arch}"
+                ARCH=%{_target_base_arch} \
+                CROSS_COMPILE=%{_target_cpu}-pld-linux- \
+%endif
+                HOSTCC="%{__cc}" \
                EXTRA_CFLAGS='-DE1000_NAPI' \
-               CC="%{__cc}" CPP="%{__cpp}" \
                M=$PWD O=$PWD \
                %{?with_verbose:V=1}