SPECS: ipw2100.spec, iscsitarget.spec - with up bcond

[glen]

Author: glen                         Date: Thu Mar 15 23:38:25 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- with up bcond

---- Files affected:
SPECS:
   ipw2100.spec (1.48 -> 1.49) , iscsitarget.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/ipw2100.spec
diff -u SPECS/ipw2100.spec:1.48 SPECS/ipw2100.spec:1.49
--- SPECS/ipw2100.spec:1.48	Tue Feb 13 09:06:35 2007
+++ SPECS/ipw2100.spec	Fri Mar 16 00:38:20 2007
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	up		# don't build UP module
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
@@ -160,10 +161,12 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-net-ipw2100
 %defattr(644,root,root,755)
 #/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/ieee80211*.ko*
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/ipw2100.ko*
+%if %{with up} || %{without dist_kernel}
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-net-ipw2100
@@ -179,6 +182,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2007/03/15 23:38:20  glen
+- with up bcond
+
 Revision 1.48  2007/02/13 08:06:35  glen
 - tabs in preamble
 

================================================================
Index: SPECS/iscsitarget.spec
diff -u SPECS/iscsitarget.spec:1.17 SPECS/iscsitarget.spec:1.18
--- SPECS/iscsitarget.spec:1.17	Tue Feb 13 09:06:35 2007
+++ SPECS/iscsitarget.spec	Fri Mar 16 00:38:20 2007
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	up		# don't build UP module
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
@@ -24,6 +25,8 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 URL:		http://iscsitarget.sourceforge.net/
+# for %%service:
+#BuildRequires:	rpmbuild(macros) >= 1.268
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.0}
 %endif
@@ -158,17 +161,11 @@
 
 %post
 /sbin/chkconfig --add targetiscsi
-#if [ -f /var/lock/subsys/targetiscsi ]; then
-#	/etc/rc.d/init.d/targetiscsi restart 1>&2
-#else
-#	echo "Type \"/etc/rc.d/init.d/targetiscsi start\" to start target iscsi" 1>&2
-#fi
+#%%service targetiscsi restart "target iscsi"
 
 %preun
 if [ "$1" = "0" ]; then
-#	if [ -f /var/lock/subsys/targetiscsi ]; then
-#		/etc/rc.d/init.d/targetiscsi stop >&2
-#	fi
+#	%%service targetiscsi stop
 	/sbin/chkconfig --del targetiscsi
 fi
 
@@ -201,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2007/03/15 23:38:20  glen
+- with up bcond
+
 Revision 1.17  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ipw2100.spec?r1=1.48&r2=1.49&f=u
    http://cvs.pld-linux.org/SPECS/iscsitarget.spec?r1=1.17&r2=1.18&f=u