Author: adamg Date: Sat Oct 14 08:54:25 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - force -j1 in make scripts - make the spec alt_kernel aware - make it buildable against kernel >= 2.6.16
---- Files affected: SPECS: ndiswrapper.spec (1.37 -> 1.37.2.1) ---- Diffs: ================================================================ Index: SPECS/ndiswrapper.spec diff -u SPECS/ndiswrapper.spec:1.37 SPECS/ndiswrapper.spec:1.37.2.1 --- SPECS/ndiswrapper.spec:1.37 Fri Mar 17 23:03:47 2006 +++ SPECS/ndiswrapper.spec Sat Oct 14 10:54:19 2006 @@ -19,9 +19,10 @@ Group: Base/Kernel Source0: http://dl.sourceforge.net/ndiswrapper/%{name}-%{version}.tar.gz # Source0-md5: a18b424cbcd5ae5b6594fd3ca5cbdd3c +Patch0: %{name}-usb_driver_owner.patch URL: http://ndiswrapper.sourceforge.net/ %if %{with kernel} -%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.8} +%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 2.6.8} BuildRequires: rpmbuild(macros) >= 1.217 %endif ExclusiveArch: %{ix86} %{x8664} @@ -47,7 +48,7 @@ Główny pakiet zawiera narzędzia przestrzeni użytkownika dla ndiswrappera. -%package -n kernel-net-ndiswrapper +%package -n kernel%{_alt_kernel}-net-ndiswrapper Summary: Loadable Linux kernel module that "wraps around" NDIS drivers Summary(pl): Moduł jądra Linuksa "owijający" sterowniki NDIS Release: [EMAIL PROTECTED] @@ -60,7 +61,7 @@ Requires: %{name} = %{epoch}:%{version}-%{_rel} Requires: dev >= 2.7.7-10 -%description -n kernel-net-ndiswrapper +%description -n kernel%{_alt_kernel}-net-ndiswrapper Some wireless LAN vendors refuse to release hardware specifications or drivers for their products for operating systems other than Microsoft Windows. The ndiswrapper project makes it possible to use such @@ -69,7 +70,7 @@ This package contains Linux kernel module. -%description -n kernel-net-ndiswrapper -l pl +%description -n kernel%{_alt_kernel}-net-ndiswrapper -l pl Niektórzy producenci bezprzewodowych kart sieciowych nie udostępniają specyfikacji lub sterowników dla swoich produktów, dla systemów innych niż Microsoft Windows. Projekt ndiswrapper umożliwia użycie takiego @@ -78,7 +79,7 @@ Ten pakiet zawiera moduł jądra Linuksa. -%package -n kernel-smp-net-ndiswrapper +%package -n kernel%{_alt_kernel}-smp-net-ndiswrapper Summary: Loadable Linux SMP kernel module that "wraps around" NDIS drivers Summary(pl): Moduł jądra Linuksa SMP "owijający" sterowniki NDIS Release: [EMAIL PROTECTED] @@ -91,7 +92,7 @@ Requires: %{name} = %{epoch}:%{version}-%{_rel} Requires: dev >= 2.7.7-10 -%description -n kernel-smp-net-ndiswrapper +%description -n kernel%{_alt_kernel}-smp-net-ndiswrapper Some wireless LAN vendors refuse to release hardware specifications or drivers for their products for operating systems other than Microsoft Windows. The ndiswrapper project makes it possible to use such @@ -100,7 +101,7 @@ This package contains Linux SMP kernel module. -%description -n kernel-smp-net-ndiswrapper -l pl +%description -n kernel%{_alt_kernel}-smp-net-ndiswrapper -l pl Niektórzy producenci bezprzewodowych kart sieciowych nie udostępniają specyfikacji lub sterowników dla swoich produktów, dla systemów innych niż Microsoft Windows. Projekt ndiswrapper umożliwia użycie takiego @@ -111,6 +112,7 @@ %prep %setup -q +%patch0 -p1 %build %if %{with userspace} @@ -130,7 +132,7 @@ ln -sf %{_kernelsrcdir}/config-$cfg o/.config ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h - %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts + %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts %{__make} x86_64_stubs gen_exports \ KSRC=. \ @@ -172,16 +174,16 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -n kernel-net-ndiswrapper +%post -n kernel%{_alt_kernel}-net-ndiswrapper %depmod %{_kernel_ver} -%postun -n kernel-net-ndiswrapper +%postun -n kernel%{_alt_kernel}-net-ndiswrapper %depmod %{_kernel_ver} -%post -n kernel-smp-net-ndiswrapper +%post -n kernel%{_alt_kernel}-smp-net-ndiswrapper %depmod %{_kernel_ver}smp -%postun -n kernel-smp-net-ndiswrapper +%postun -n kernel%{_alt_kernel}-smp-net-ndiswrapper %depmod %{_kernel_ver}smp %if %{with userspace} @@ -194,12 +196,12 @@ %endif %if %{with kernel} -%files -n kernel-net-ndiswrapper +%files -n kernel%{_alt_kernel}-net-ndiswrapper %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/ndiswrapper.ko* %if %{with smp} && %{with dist_kernel} -%files -n kernel-smp-net-ndiswrapper +%files -n kernel%{_alt_kernel}-smp-net-ndiswrapper %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}smp/misc/ndiswrapper.ko* %endif @@ -211,6 +213,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37.2.1 2006/10/14 08:54:19 adamg +- force -j1 in make scripts +- make the spec alt_kernel aware +- make it buildable against kernel >= 2.6.16 + Revision 1.37 2006/03/17 22:03:47 glen - rel 6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ndiswrapper.spec?r1=1.37&r2=1.37.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
