SPECS: ndiswrapper.spec - alt_kernel from AC-branch

[glen]

Author: glen                         Date: Fri Apr  4 19:08:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- alt_kernel from AC-branch

---- Files affected:
SPECS:
   ndiswrapper.spec (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: SPECS/ndiswrapper.spec
diff -u SPECS/ndiswrapper.spec:1.103 SPECS/ndiswrapper.spec:1.104
--- SPECS/ndiswrapper.spec:1.103	Mon Feb 18 16:44:24 2008
+++ SPECS/ndiswrapper.spec	Fri Apr  4 21:08:04 2008
@@ -5,22 +5,25 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace tools
 %bcond_with	verbose		# verbose build (V=1)
-%bcond_with	grsec_kernel	# build for kernel-grsecurity
-#
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
+
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine	with_userspace
 %endif
-#
-%define		_rel	1
+
+%define		rel	1
+%define		pname	ndiswrapper
 Summary:	Tools to "wrap around" NDIS drivers
 Summary(pl.UTF-8):	Narzędzia "opakowujące" sterowniki NDIS
 Name:		ndiswrapper
 Version:	1.52
-Release:	%{_rel}
+Release:	%{rel}
 Epoch:		1
 License:	GPL
 Group:		Base/Kernel
-Source0:	http://dl.sourceforge.net/ndiswrapper/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/ndiswrapper/%{pname}-%{version}.tar.gz
 # Source0-md5:	3ab2aeef398d29df3a40d40fa499405e
 URL:		http://ndiswrapper.sourceforge.net/
 %if %{with kernel}
@@ -57,14 +60,15 @@
 %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:	%{_rel}@%{_kernel_ver_str}
+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
-Requires:	%{name} = %{epoch}:%{version}-%{_rel}
+# loose dep intentional
+Requires:	%{pname} = %{epoch}:%{version}
 Requires:	dev >= 2.7.7-10
 
 %description -n kernel%{_alt_kernel}-net-ndiswrapper
@@ -86,7 +90,7 @@
 Ten pakiet zawiera moduł jądra Linuksa.
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 %{__sed} -i -e 's#"loader.h"#"../driver/loader.h"#g' utils/loadndisdriver.c
 %{__sed} -i -e 's#$(KBUILD)/.config#$(KBUILD)/config-%{!?with_dist_kernel:non}dist#g' driver/Makefile
 %{__sed} -i -e 's at KBUILD := $(shell readlink -f /lib/modules/$(KVERS)/source)@@g' driver/Makefile
@@ -162,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2008-04-04 19:08:04  glen
+- alt_kernel from AC-branch
+
 Revision 1.103  2008-02-18 15:44:24  ciesiel
 - upgraded to version 1.52
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ndiswrapper.spec?r1=1.103&r2=1.104&f=u