X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=35e754319c007b20fcd14cd379bd658dc4545048;hp=b51aad5431375e5a8310af70968fbec44d5a3ac0;hb=6d9878b02ee5f644d34c35464a7a6e6a3051719f;hpb=e67e8464a87d2db0e785d520d88eaf31be9d7e5b

diff --git a/e1000.spec b/e1000.spec
index b51aad5..35e7543 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -4,6 +4,9 @@
 #
 %define		_orig_name	e1000
 
+%{!?_without_dist_kernel:%define	_mod_name %{_orig_name}_intel }
+%{?_without_dist_kernel:%define		_mod_name %{_orig_name} }
+
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl):	Sterownik do karty Intel(R) PRO/1000
 Name:		kernel-net-%{_orig_name}
@@ -15,7 +18,7 @@ Vendor:		Intel Corporation
 Group:		Base/Kernel
 Source0:	ftp://aiedownload.intel.com/df-support/2897/eng/%{_orig_name}-%{version}.tar.gz
 # Source0-md5:	52a65f13fda89257edbc4507958c6e3a
-%{!?_without_dist_kernel:BuildRequires:	kernel-headers > 2.4 }
+%{!?_without_dist_kernel:BuildRequires:	kernel-headers >= 2.4.20 }
 BuildRequires:	%{kgcc_package}
 BuildRequires:	rpmbuild(macros) >= 1.118
 URL:		http://support.intel.com/support/network/adapter/pro100/
@@ -59,19 +62,29 @@ Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
 %build
 %ifarch %{ix86}
 %{__make} -C src SMP=1 CC="%{kgcc} -DCONFIG_X86_LOCAL_APIC -DSTB_WA" KSRC=%{_kernelsrcdir}
-%else
+%endif
+%ifarch ppc
+%{__make} -C src SMP=1 CC="%{kgcc} -msoft-float  -DSTB_WA" KSRC=%{_kernelsrcdir}
+%endif
+%ifnarch %{ix86} ppc
 %{__make} -C src SMP=1 CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
 %endif
 mv -f src/%{_orig_name}.o src/%{_orig_name}-smp.o
+
 %{__make} -C src clean KSRC=%{_kernelsrcdir}
+
+%ifarch ppc
+%{__make} -C src CC="%{kgcc} -msoft-float -DSTB_WA" KSRC=%{_kernelsrcdir}
+%else
 %{__make} -C src CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
-install src/%{_orig_name}-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.o
-install src/%{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_orig_name}.o
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/misc
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/misc
+install src/%{_orig_name}-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/misc/%{_mod_name}.o
+install src/%{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/misc/%{_mod_name}.o
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,9 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc %{_orig_name}.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}/misc/*
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/misc/*
 
 %files -n kernel-smp-net-%{_orig_name}
 %defattr(644,root,root,755)
 %doc %{_orig_name}.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}smp/misc/*
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/misc/*