SPECS: hsfmodem.spec - cleanup

[qboosh]

Author: qboosh                       Date: Tue Oct  4 20:30:56 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup

---- Files affected:
SPECS:
   hsfmodem.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/hsfmodem.spec
diff -u SPECS/hsfmodem.spec:1.5 SPECS/hsfmodem.spec:1.6
--- SPECS/hsfmodem.spec:1.5	Sun Oct  2 19:44:10 2005
+++ SPECS/hsfmodem.spec	Tue Oct  4 22:30:50 2005
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	dist_kernel	# without distribution kernel
+#
 Summary:	Conexant HSF controllerless modem driver userspace utils
 Summary(pl):	Narzędzia do sterownika winmodemów HSF firmy Conexant
 Name:		hsfmodem
@@ -14,9 +18,8 @@
 Source2:	http://www.linuxant.com/drivers/files/listmodem_app_linux.tar.gz
 # Source2-md5:	516f3825014eb460a0c16cbd927a80d1
 URL:		http://www.linuxant.com/
-%{!?_without_dist_kernel:BuildRequires:	kernel-source}
+%{?with_dist_kernel:BuildRequires:	kernel-module-build}
 BuildRequires:	%{kgcc_package}
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
 Requires:	pciutils
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -29,34 +32,40 @@
 %description -l pl
 Sterownik do winmodemów HSF firmy Conexant dla Linuksa.  Ten pakiet 
 zawiera tylko darmową wersję sterowników, która ogranicza transfer 
-do 14kbps i użycie faxu. Pełna wersja dostępna jest na linuxant.com.
+do 14kbps i nie pozwala na użycie faksu. Pełna wersja dostępna jest na
+linuxant.com.
 
 %package -n kernel-char-hsf
 Summary:	Conexant HSF controllerless modem driver 
 Summary(pl):	Sterownik do winmodemów HSF firmy Conexant
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:Requires(postun):	kernel-smp}
+%{?with_dist_kernel:Requires(postun):	kernel-up}
 
 %description -n kernel-char-hsf
-This is a Linux driver for Conexant HSF controllerless modem driver 
+This is a Linux driver for Conexant HSF controllerless modem driver.
 
 %description -n kernel-char-hsf -l pl
-Sterownik dla Linuksa do winmodemów HSF firmy Conexant
+Sterownik dla Linuksa do winmodemów HSF firmy Conexant.
 
 %prep
 %setup -q
 
 %build
-%{__make} all KERNELSRC=%{_kernelsrcdir}
-%{__make} --quiet --no-print-directory CNXT_KERNELSRC=%{_kernelsrcdir} DISTRO_CFLAGS="-D__MODULE_KERNEL_%{_target_cpu}=1" CNXT_MODS_DIR=binaries/linux-genetic clean all modules
+%{__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
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,-smp}/misc
+
 %{__make} install \
 	ROOT=$RPM_BUILD_ROOT \
 	KERNELSRC=%{_kernelsrcdir}
@@ -67,26 +76,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+#%post
 #%{_sbindir}/hsfconfig --auto
-%depmod %{_kernel_ver}
 
-%preun
+#%preun
 #%{_sbindir}/hsfconfig --remove
 
-%postun
-%depmod %{_kernel_ver}
-
 %post -n kernel-char-hsf
 %depmod %{_kernel_ver}
 
 %postun -n kernel-char-hsf
 %depmod %{_kernel_ver}
 
-%files -n kernel-char-hsf
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*.ko*
-
 %files
 %defattr(644,root,root,755)
 %doc BUGS CHANGES CREDITS FAQ INSTALL LICENSE README
@@ -94,21 +95,28 @@
 %dir /etc/hsfmodem
 %dir /etc/hsfmodem/nvm
 /etc/hsfmodem/package
-/usr/lib/hsfmodem/rchsf
 %config /etc/hsfmodem/nvm/*
 %dir %{_libdir}/hsfmodem
+%{_libdir}/hsfmodem/LICENSE
 %config %{_libdir}/hsfmodem/config.mak
+%{_libdir}/hsfmodem/rchsf
 %dir %{_libdir}/hsfmodem/modules
-%attr(644,root,root) %{_libdir}/hsfmodem/LICENSE
 %{_libdir}/hsfmodem/modules/[!k]*
 %attr(755,root,root) %{_libdir}/hsfmodem/modules/*.sh
 
+%files -n kernel-char-hsf
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/*.ko*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/10/04 20:30:50  qboosh
+- cleanup
+
 Revision 1.5  2005/10/02 17:44:10  hunter
 - upgrade
 - build .ko files in %build not after installing rpm
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hsfmodem.spec?r1=1.5&r2=1.6&f=u