SPECS: go7007.spec, gspca.spec, i2c.spec, ipp2p.spec, ipp2p24.spec...

glen glen at pld-linux.org
Fri Mar 16 00:02:04 CET 2007


Author: glen                         Date: Thu Mar 15 23:02:03 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up bcond

---- Files affected:
SPECS:
   go7007.spec (1.12 -> 1.13) , gspca.spec (1.5 -> 1.6) , i2c.spec (1.43 -> 1.44) , ipp2p.spec (1.56 -> 1.57) , ipp2p24.spec (1.25 -> 1.26) , kernel-scsi-mv.spec (1.19 -> 1.20) , p2p.spec (1.25 -> 1.26) , p2p24.spec (1.16 -> 1.17) , submount.spec (1.24 -> 1.25) , svgalib.spec (1.169 -> 1.170) , unionfs.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: SPECS/go7007.spec
diff -u SPECS/go7007.spec:1.12 SPECS/go7007.spec:1.13
--- SPECS/go7007.spec:1.12	Tue Feb 13 08:16:47 2007
+++ SPECS/go7007.spec	Fri Mar 16 00:01:58 2007
@@ -7,6 +7,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 programs
 %bcond_with	verbose		# verbose build (V=1)
@@ -202,9 +203,11 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-extra-go7007
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/extra/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-extra-go7007
@@ -236,6 +239,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.12  2007/02/13 07:16:47  glen
 - tabs in preamble
 

================================================================
Index: SPECS/gspca.spec
diff -u SPECS/gspca.spec:1.5 SPECS/gspca.spec:1.6
--- SPECS/gspca.spec:1.5	Tue Feb 13 08:16:47 2007
+++ SPECS/gspca.spec	Fri Mar 16 00:01:58 2007
@@ -3,10 +3,11 @@
 # 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_with	verbose		# verbose build (V=1)
 
-%if !%{with kernel}
+%if %{without kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -126,9 +127,11 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-video-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/%{_module_dir}/gspca.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-video-%{name}
@@ -143,6 +146,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.5  2007/02/13 07:16:47  glen
 - tabs in preamble
 

================================================================
Index: SPECS/i2c.spec
diff -u SPECS/i2c.spec:1.43 SPECS/i2c.spec:1.44
--- SPECS/i2c.spec:1.43	Tue Feb 13 09:06:35 2007
+++ SPECS/i2c.spec	Fri Mar 16 00:01:58 2007
@@ -7,6 +7,7 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without kernel from distribution (REQUIRED, see above!)
+%bcond_without	up		# don't build UP modules
 %bcond_without	smp		# don't build SMP modules
 #
 Summary:	Updated i2c drivers
@@ -150,8 +151,10 @@
 
 %files -n kernel-i2c
 %defattr(644,root,root,755)
+%if %{with up} || %{without dist_kernel}
 %dir /lib/modules/%{_kernel_ver}/kernel/drivers/i2c
 /lib/modules/%{_kernel_ver}/kernel/drivers/i2c/*.o*
+%endif
 
 %if %{with smp}
 %files -n kernel-smp-i2c
@@ -171,6 +174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.43  2007/02/13 08:06:35  glen
 - tabs in preamble
 
@@ -246,7 +252,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.19  2003/05/16 08:33:42  trojan
-- fixed depmod in %%post and %%postun when build with _without_dist_kernel
+- fixed depmod in %post and %postun when build with _without_dist_kernel
 
 Revision 1.18  2003/05/15 16:21:32  bszx
 - added _without_smp bcond in the way like in alsa-driver
@@ -267,7 +273,7 @@
 - updated URLs
 
 Revision 1.12  2002/04/25 16:34:58  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.11  2002/03/27 20:04:04  qboosh
 - updated to 2.6.3
@@ -280,7 +286,7 @@
   Group field using gettext).
 
 Revision 1.8  2002/01/18 02:13:18  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.7  2001/11/22 18:55:30  qboosh
 - updated to 2.6.2

================================================================
Index: SPECS/ipp2p.spec
diff -u SPECS/ipp2p.spec:1.56 SPECS/ipp2p.spec:1.57
--- SPECS/ipp2p.spec:1.56	Wed Feb 21 09:50:31 2007
+++ SPECS/ipp2p.spec	Fri Mar 16 00:01:58 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)
@@ -230,7 +231,9 @@
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-net-ipp2p
 %defattr(644,root,root,755)
+%if %{with up} || %{without dist_kernel}
 /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_%{name}.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-net-ipp2p
@@ -251,6 +254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.56  2007/02/21 08:50:31  mguevara
 - api change in checkentry was in 2.6.19 not .17, sorry
 

================================================================
Index: SPECS/ipp2p24.spec
diff -u SPECS/ipp2p24.spec:1.25 SPECS/ipp2p24.spec:1.26
--- SPECS/ipp2p24.spec:1.25	Tue Feb 13 09:06:35 2007
+++ SPECS/ipp2p24.spec	Fri Mar 16 00:01:58 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
 
@@ -239,9 +240,11 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel24-net-ipp2p
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel24-smp-net-ipp2p
@@ -262,6 +265,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.25  2007/02/13 08:06:35  glen
 - tabs in preamble
 

================================================================
Index: SPECS/kernel-scsi-mv.spec
diff -u SPECS/kernel-scsi-mv.spec:1.19 SPECS/kernel-scsi-mv.spec:1.20
--- SPECS/kernel-scsi-mv.spec:1.19	Tue Feb 13 09:06:37 2007
+++ SPECS/kernel-scsi-mv.spec	Fri Mar 16 00:01:58 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_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
@@ -100,10 +101,12 @@
 %postun -n kernel%{_alt_kernel}-smp-scsi-mv
 %depmod %{_kernel_ver}smp
 
+%if %{with up} || %{without dist_kernel}
 %files
 %defattr(644,root,root,755)
 %doc LinuxIAL/ReleaseNotes.txt
 /lib/modules/%{_kernel_ver}/kernel/drivers/scsi/mv_sata.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-scsi-mv
@@ -118,6 +121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.19  2007/02/13 08:06:37  glen
 - tabs in preamble
 

================================================================
Index: SPECS/p2p.spec
diff -u SPECS/p2p.spec:1.25 SPECS/p2p.spec:1.26
--- SPECS/p2p.spec:1.25	Tue Feb 13 08:16:51 2007
+++ SPECS/p2p.spec	Fri Mar 16 00:01:58 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)
@@ -162,8 +163,10 @@
 
 %if %{with kernel}
 %files
+%if %{with up} || %{without dist_kernel}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-net-p2p
@@ -184,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.25  2007/02/13 07:16:51  glen
 - tabs in preamble
 

================================================================
Index: SPECS/p2p24.spec
diff -u SPECS/p2p24.spec:1.16 SPECS/p2p24.spec:1.17
--- SPECS/p2p24.spec:1.16	Tue Feb 13 08:16:51 2007
+++ SPECS/p2p24.spec	Fri Mar 16 00:01:58 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
 
@@ -177,9 +178,11 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel24-net-p2p
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel24-smp-net-p2p
@@ -200,6 +203,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.16  2007/02/13 07:16:51  glen
 - tabs in preamble
 

================================================================
Index: SPECS/submount.spec
diff -u SPECS/submount.spec:1.24 SPECS/submount.spec:1.25
--- SPECS/submount.spec:1.24	Mon Feb 12 23:09:16 2007
+++ SPECS/submount.spec	Fri Mar 16 00:01:58 2007
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without 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 utilities
 %bcond_with	verbose		# verbose build (V=1)
@@ -176,9 +177,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-fs-subfs
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/fs/subfs.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-fs-subfs
@@ -193,6 +196,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.24  2007/02/12 22:09:16  glen
 - tabs in preamble
 

================================================================
Index: SPECS/svgalib.spec
diff -u SPECS/svgalib.spec:1.169 SPECS/svgalib.spec:1.170
--- SPECS/svgalib.spec:1.169	Mon Mar  5 19:49:13 2007
+++ SPECS/svgalib.spec	Fri Mar 16 00:01:58 2007
@@ -4,7 +4,8 @@
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
 %bcond_with	kernel24	# force using kernel24 headers
-%bcond_without	smp		# don't build smp module
+%bcond_without	up		# don't build UP module
+%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace packages
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
@@ -484,9 +485,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{k24}%{_alt_kernel}-video-svgalib_helper
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/svgalib_helper.%{kmodext}*
+%endif
 
 %if %{with dist_kernel} && %{with smp}
 %files -n kernel%{k24}%{_alt_kernel}-smp-video-svgalib_helper
@@ -501,6 +504,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.169  2007/03/05 18:49:13  megabajt
 - fixed symlink to file which doesn't exist
 - release 4

================================================================
Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.30 SPECS/unionfs.spec:1.31
--- SPECS/unionfs.spec:1.30	Mon Feb 12 23:09:18 2007
+++ SPECS/unionfs.spec	Fri Mar 16 00:01:58 2007
@@ -6,6 +6,7 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace programs
 %bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	up		# don't build UP module
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_without	vserver		# build with vserver patches
@@ -149,9 +150,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-fs-unionfs
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/fs/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-fs-unionfs
@@ -166,6 +169,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2007/03/15 23:01:58  glen
+- up bcond
+
 Revision 1.30  2007/02/12 22:09:18  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/go7007.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/gspca.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/i2c.spec?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/SPECS/ipp2p.spec?r1=1.56&r2=1.57&f=u
    http://cvs.pld-linux.org/SPECS/ipp2p24.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/kernel-scsi-mv.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SPECS/p2p.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/p2p24.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/submount.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/svgalib.spec?r1=1.169&r2=1.170&f=u
    http://cvs.pld-linux.org/SPECS/unionfs.spec?r1=1.30&r2=1.31&f=u



More information about the pld-cvs-commit mailing list