SPECS: hsfmodem.spec - kernel_build macros, TODO - userspace

[wolvverine]

Author: wolvverine                   Date: Fri Sep 28 09:59:18 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kernel_build macros, TODO - userspace

---- Files affected:
SPECS:
   hsfmodem.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/hsfmodem.spec
diff -u SPECS/hsfmodem.spec:1.10 SPECS/hsfmodem.spec:1.11
--- SPECS/hsfmodem.spec:1.10	Tue Mar 13 10:51:25 2007
+++ SPECS/hsfmodem.spec	Fri Sep 28 11:59:12 2007
@@ -1,25 +1,27 @@
-# $Revision$, $Date$
+#Revision: 1.10 $, $Date$
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	userspace	#
+%bcond_with	verbose		# verbose build (V=1)
 #
-%define	_rel	1
+%define	_rel	0.1
 Summary:	Conexant HSF controllerless modem driver userspace utils
 Summary(pl.UTF-8):	Narzędzia do sterownika winmodemów HSF firmy Conexant
 Name:		hsfmodem
-Version:	7.18.00.06full
+Version:	7.60.00.09full
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	Custom Licence by (c) 2003-2004 Linuxant inc. All rights reserved.
 Group:		Base/Kernel
-Source0:	http://www.linuxant.com/drivers/hsf/full/archive/%{name}-%{version}/hsfmodem-%{version}.tar.gz
-# Source0-md5:	2d725bd8e484a4037daefec6208ba28b
-Source1:	http://www.linuxant.com/drivers/hsf/full/archive/hsfmodem-7.18.00.06full/100498D_RM_HxF_Released.pdf
+Source0:	http://www.linuxant.com/drivers/hsf/full/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	91e42c01c8d69ad79e0793770e2059d4
+Source1:	http://www.linuxant.com/drivers/hsf/full/archive/%{name}-%{version}/100498D_RM_HxF_Released.pdf
 # Source1-md5:	e6d8fea8f5f641d7bb4dfb33c6f478e7
 Source2:	http://www.linuxant.com/drivers/files/listmodem_app_linux.tar.gz
 # Source2-md5:	516f3825014eb460a0c16cbd927a80d1
 URL:		http://www.linuxant.com/
 BuildRequires:	%{kgcc_package}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build}
+%{?with_dist_kernel:BuildRequires:      kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 Requires:	pciutils
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -35,43 +37,50 @@
 14kbps i nie pozwala na użycie faksu. Pełna wersja dostępna jest na
 linuxant.com.
 
-%package -n kernel-char-hsf
+%package -n kernel%{_alt_kernel}-char-hsf
 Summary:	Conexant HSF controllerless modem driver
 Summary(pl.UTF-8):	Sterownik do winmodemów HSF firmy Conexant
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:Requires(postun):	kernel-up}
+%{?with_dist_kernel:Requires(postun):	kernel%{_alt_kernel}}
 
-%description -n kernel-char-hsf
+%description -n kernel%{_alt_kernel}-char-hsf
 This is a Linux driver for Conexant HSF controllerless modem driver.
 
-%description -n kernel-char-hsf -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-char-hsf -l pl.UTF-8
 Sterownik dla Linuksa do winmodemów HSF firmy Conexant.
 
 %prep
 %setup -q
 
 %build
+%if %{with dist_kernel}
+%build_kernel_modules -m hsfpcibasic2,hsfmc97ich,hsfmc97via,hsfmc97ali,hsfmc97ati,hsfmc97sis,hsfusbcd2,hsfhda,hsfsoar,hsfserial,hsfengine,hsfosspec -C modules
+%endif
+
+%if %{with userspace}
 %{__make} all \
 	KERNELSRC=%{_kernelsrcdir}
-
-%{__make} --quiet --no-print-directory clean all modules \
-	CNXT_KERNELSRC=%{_kernelsrcdir} \
-	DISTRO_CFLAGS="-D__MODULE_KERNEL_%{_target_cpu}=1" \
-	CNXT_MODS_DIR=binaries/linux-genetic
+#TODO
+#%{__make} --quiet --no-print-directory clean all modules
+#	CNXT_KERNELSRC=%{_kernelsrcdir} \
+#	DISTRO_CFLAGS="-D__MODULE_KERNEL_%{_target_cpu}=1" \
+#	CNXT_MODS_DIR=binaries/linux-genetic
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,-smp}/misc
+%if %{with dist_kernel}
+%install_kernel_modules -d misc -m modules/hsfpcibasic2,modules/hsfmc97ich,modules/hsfmc97via,modules/hsfmc97ali,modules/hsfmc97ati,modules/hsfmc97sis,modules/hsfusbcd2,modules/hsfhda,modules/hsfsoar,modules/hsfserial,modules/hsfengine,modules/hsfosspec
+%endif
 
+%if %{with userspace}
 %{__make} install \
 	ROOT=$RPM_BUILD_ROOT \
 	KERNELSRC=%{_kernelsrcdir}
-
-install modules/*.ko  $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
-#{,-smp}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,12 +91,13 @@
 #%preun
 #%{_sbindir}/hsfconfig --remove
 
-%post -n kernel-char-hsf
+%post -n kernel%{_alt_kernel}-char-hsf
 %depmod %{_kernel_ver}
 
-%postun -n kernel-char-hsf
+%postun -n kernel%{_alt_kernel}-char-hsf
 %depmod %{_kernel_ver}
 
+%if %{with userspace}
 %files
 %defattr(644,root,root,755)
 %doc BUGS CHANGES CREDITS FAQ INSTALL LICENSE README
@@ -103,10 +113,13 @@
 %dir %{_libdir}/hsfmodem/modules
 %{_libdir}/hsfmodem/modules/[!k]*
 %attr(755,root,root) %{_libdir}/hsfmodem/modules/*.sh
+%endif
 
-%files -n kernel-char-hsf
+%if %{with dist_kernel}
+%files -n kernel%{_alt_kernel}-char-hsf
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -114,6 +127,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2007/09/28 09:59:12  wolvverine
+- kernel_build macros, TODO - userspace
+
 Revision 1.10  2007/03/13 09:51:25  sparky
 - place # SourceN-md5: just after SourceN:
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/hsfmodem.spec?r1=1.10&r2=1.11&f=u