SPECS: eagle-usb.spec - merge alt kernel fixes from AC-branch

[glen]

Author: glen                         Date: Thu Apr  3 20:35:35 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge alt kernel fixes from AC-branch

---- Files affected:
SPECS:
   eagle-usb.spec (1.94 -> 1.95) 

---- Diffs:

================================================================
Index: SPECS/eagle-usb.spec
diff -u SPECS/eagle-usb.spec:1.94 SPECS/eagle-usb.spec:1.95
--- SPECS/eagle-usb.spec:1.94	Thu May 31 17:50:18 2007
+++ SPECS/eagle-usb.spec	Thu Apr  3 22:35:30 2008
@@ -9,36 +9,39 @@
 %bcond_without	userspace	# don't build userspace tools
 %bcond_without	cmvs
 %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
-#
+
 %ifarch sparc
 # no USB in sparc(32) kernel; just build userspace to use with sparc64 kernel
 %undefine	with_kernel
 %endif
-%define		_rel	4
+%define		rel	4
+%define		pname	eagle-usb
 Summary:	Linux driver for the Eagle 8051 Analog (sagem f at st 800/840/908/...) modems
 Summary(pl.UTF-8):	Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f at st 800/840/908/...)
-Name:		eagle-usb
+Name:		%{pname}%{_alt_kernel}
 Version:	2.3.3
-Release:	%{_rel}
+Release:	%{rel}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://download.gna.org/eagleusb/eagle-usb-2.3.0/%{name}-%{version}.tar.bz2
+Source0:	http://download.gna.org/eagleusb/eagle-usb-2.3.0/%{pname}-%{version}.tar.bz2
 # Source0-md5:	6c961a5022274aff870e49e2f0f922fc
-Patch1:		%{name}-eu_types.patch
-Patch2:		%{name}-vpivci-info.patch
-Patch3:		%{name}-opt.patch
-Patch4:		%{name}-signal.patch
-Patch5:		%{name}-usb_kill_urb.patch
-Patch6:		%{name}-kernel_sources_checking_hack.patch
+Patch1:		%{pname}-eu_types.patch
+Patch2:		%{pname}-vpivci-info.patch
+Patch3:		%{pname}-opt.patch
+Patch4:		%{pname}-signal.patch
+Patch5:		%{pname}-usb_kill_urb.patch
+Patch6:		%{pname}-kernel_sources_checking_hack.patch
 # Workaround for obsolete kernel API. To be removed...
-Patch7:		%{name}-spin_lock_unlocked.patch
-Patch8:		%{name}-kill_owner.patch
-Patch9:		%{name}-module_param.patch
+Patch7:		%{pname}-spin_lock_unlocked.patch
+Patch8:		%{pname}-kill_owner.patch
+Patch9:		%{pname}-module_param.patch
 URL:		http://gna.org/projects/eagleusb/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -51,6 +54,9 @@
 Requires:	ppp >= 2.4.1
 Obsoletes:	eagle-utils
 Conflicts:	eagle-usb24
+%if %{without userspace}
+ExcludeArch:	sparc
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,11 +70,10 @@
 %package -n kernel%{_alt_kernel}-usb-eagle
 Summary:	Linux driver for the Eagle 8051 Analog (sagem f at st 800/840/908/...) modems
 Summary(pl.UTF-8):	Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f at st 800/840/908/...)
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel-usb(eagle) = %{version}-%{_rel}
 %if "%{_alt_kernel}" == "%{_nil}"
 Obsoletes:	kernel-usb-fast800
 %endif
@@ -82,7 +87,7 @@
 800/840/908/...).
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -175,6 +180,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2008-04-03 20:35:30  glen
+- merge alt kernel fixes from AC-branch
+
 Revision 1.94  2007-05-31 15:50:18  areq
 - Th kernel ready
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eagle-usb.spec?r1=1.94&r2=1.95&f=u