SPECS: kernel-misc-mwavem.spec - new-style bcond

[qboosh]

Author: qboosh                       Date: Mon Dec 19 18:23:05 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new-style bcond

---- Files affected:
SPECS:
   kernel-misc-mwavem.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/kernel-misc-mwavem.spec
diff -u SPECS/kernel-misc-mwavem.spec:1.8 SPECS/kernel-misc-mwavem.spec:1.9
--- SPECS/kernel-misc-mwavem.spec:1.8	Tue Dec 13 13:56:54 2005
+++ SPECS/kernel-misc-mwavem.spec	Mon Dec 19 19:23:00 2005
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# _without_dist_kernel          without distribution kernel
+%bcond_without	dist_kernel	# without distribution kernel
 #
 %define		_orig_name	mwavem
 %define		_rel		0.1
@@ -19,9 +19,9 @@
 BuildRequires:	%{kgcc_package}
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{!?_without_dist_kernel:BuildRequires:	kernel-headers}
+%{?with_dist_kernel:BuildRequires:	kernel-headers}
 BuildRequires:	rpmbuild(macros) >= 1.118
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Provides:	kernel-mwavem-%{_rel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,7 +37,7 @@
 Summary(pl):	Moduł jądra SMP - sterownik do modemu ACP
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 Provides:	kernel-mwavem-%{_rel}
 
@@ -51,8 +51,8 @@
 Summary:	mwavem - utils
 Summary(pl):	mwavem - marzędzia
 Release:	%{_rel}
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
 Group:		Base/Kernel
+%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires:	kernel-mwavem = %{_rel}
 
 %description -n %{_orig_name}
@@ -74,18 +74,22 @@
 
 cd src/drivers
 
-%{__make} CC="%{kgcc} -D__SMP__"
+%{__make} \
+	CC="%{kgcc} -D__SMP__"
 
 mv -f mwavedd.o mwavedd.o.smp.o
 
-%{__make} CC="%{kgcc}"
+%{__make} \
+	CC="%{kgcc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
 cp src/drivers/mwavedd.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 cp src/drivers/mwavedd.o.smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.o
 
@@ -125,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/12/19 18:23:00  qboosh
+- new-style bcond
+
 Revision 1.8  2005/12/13 12:56:54  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-misc-mwavem.spec?r1=1.8&r2=1.9&f=u