Author: glen Date: Thu Jul 3 11:20:07 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- update from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch
---- Files affected:
SPECS:
ndiswrapper.spec (1.37.2.37 -> 1.37.2.38)
---- Diffs:
================================================================
Index: SPECS/ndiswrapper.spec
diff -u SPECS/ndiswrapper.spec:1.37.2.37 SPECS/ndiswrapper.spec:1.37.2.38
--- SPECS/ndiswrapper.spec:1.37.2.37 Tue Jun 10 19:01:04 2008
+++ SPECS/ndiswrapper.spec Thu Jul 3 13:20:02 2008
@@ -3,8 +3,6 @@
%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace tools
-%bcond_without smp # don't build SMP module
-%bcond_without up # don't build UP module
%bcond_with verbose # verbose build (V=1)
%if %{without kernel}
@@ -13,13 +11,18 @@
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define _enable_debug_packages 0
+%endif
+%define rel 66
%define pname ndiswrapper
Summary: Tools to "wrap around" NDIS drivers
Summary(pl.UTF-8): Narzędzia "opakowujące" sterowniki NDIS
Name: %{pname}%{_alt_kernel}
Version: 1.15
-Release: 64
+Release: %{rel}
Epoch: 1
License: GPL
Group: Base/Kernel
@@ -29,7 +32,7 @@
URL: http://ndiswrapper.sourceforge.net/
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
2.6.8}
-BuildRequires: rpmbuild(macros) >= 1.379
+BuildRequires: rpmbuild(macros) >= 1.452
%endif
BuildRequires: sed >= 4.0
ExclusiveArch: %{ix86} %{x8664}
@@ -58,12 +61,14 @@
%package -n kernel%{_alt_kernel}-net-ndiswrapper
Summary: Loadable Linux kernel module that "wraps around" NDIS drivers
Summary(pl.UTF-8): Moduł jądra Linuksa "owijający" sterowniki NDIS
+Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
# loose dep intentional
Requires: %{pname} = %{epoch}:%{version}
Requires: dev >= 2.7.7-10
+Obsoletes: kernel%{_alt_kernel}-smp-net-ndiswrapper
%description -n kernel%{_alt_kernel}-net-ndiswrapper
Some wireless LAN vendors refuse to release hardware specifications or
@@ -83,34 +88,6 @@
Ten pakiet zawiera moduł jądra Linuksa.
-%package -n kernel%{_alt_kernel}-smp-net-ndiswrapper
-Summary: Loadable Linux SMP kernel module that "wraps around" NDIS
drivers
-Summary(pl.UTF-8): Moduł jądra Linuksa SMP "owijający" sterowniki NDIS
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
-# loose dep intentional
-Requires: %{pname} = %{epoch}:%{version}
-Requires: dev >= 2.7.7-10
-
-%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
-hardware with Linux by means of a loadable kernel module that "wraps
-around" NDIS (Windows network driver API) drivers.
-
-This package contains Linux SMP kernel module.
-
-%description -n kernel%{_alt_kernel}-smp-net-ndiswrapper -l pl.UTF-8
-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
-sprzętu w systemie Linux, dostarczając moduł jądra który "owija"
-sterowniki NDIS (API sterowników sieciowych w Windows).
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
%prep
%setup -q -n %{pname}-%{version}
%patch0 -p1
@@ -166,12 +143,6 @@
%postun -n kernel%{_alt_kernel}-net-ndiswrapper
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-net-ndiswrapper
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-ndiswrapper
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -182,25 +153,20 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-net-ndiswrapper
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/ndiswrapper.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-ndiswrapper
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/ndiswrapper.ko*
-%endif
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.37.2.38 2008/07/03 11:20:02 glen
+- update from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch
+
Revision 1.37.2.37 2008/06/10 17:01:04 adamg
- patchname fixed (no altkernel)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ndiswrapper.spec?r1=1.37.2.37&r2=1.37.2.38&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
