SPECS (LINUX_2_6_16): kernel.spec - bconded and disabled ReiserFS ...

[hawk]

Author: hawk                         Date: Sun Oct 22 20:12:35 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- bconded and disabled ReiserFS 4 support, for now it will not be included
  in any official Ac kernel
- fixed one typo
- release 3

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.36 -> 1.441.2.1558.2.37) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.36 SPECS/kernel.spec:1.441.2.1558.2.37
--- SPECS/kernel.spec:1.441.2.1558.2.36	Thu Sep 28 23:42:55 2006
+++ SPECS/kernel.spec	Sun Oct 22 22:12:29 2006
@@ -26,6 +26,7 @@
 %bcond_with	vesafb_tng	# vesafb-tng, vesafb replacement from gentoo
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
+%bcond_with	reiserfs4	# build with ReuserFS 4 support
 
 %{?debug:%define with_verbose 1}
 
@@ -93,7 +94,7 @@
 %endif
 %endif
 
-## Program required by kernel to work.
+## Programs required by kernel to work.
 %define		_binutils_ver		2.12.1
 %define		_util_linux_ver		2.10o
 %define		_module_init_tool_ver	0.9.10
@@ -113,7 +114,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			2
+%define		_rel			3
 
 %define		_netfilter_snap		20060504
 %define		_nf_hipac_ver		0.9.1
@@ -340,7 +341,9 @@
 Conflicts:	ppp < %{_ppp_ver}
 Conflicts:	procps < %{_procps_ver}
 Conflicts:	quota-tools < %{_quota_tools_ver}
+%if %{with reiserfs4}
 Conflicts:	reiser4progs < %{_reiser4progs_ver}
+%endif
 Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:	udev < %{_udev_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
@@ -526,7 +529,9 @@
 Conflicts:	ppp < %{_ppp_ver}
 Conflicts:	procps < %{_procps_ver}
 Conflicts:	quota-tools < %{_quota_tools_ver}
+%if %{with reiserfs4}
 Conflicts:	reiser4progs < %{_reiser4progs_ver}
+%endif
 Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
@@ -745,7 +750,9 @@
 %patch71 -p1
 
 # reiserfs4
+%if %{with reiserfs4}
 %{__gzip} -dc %{SOURCE12} | %{__patch} -s -p1
+%endif
 
 %patch2 -p1
 
@@ -1680,6 +1687,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.37  2006/10/22 20:12:29  hawk
+- bconded and disabled ReiserFS 4 support, for now it will not be included
+  in any official Ac kernel
+- fixed one typo
+- release 3
+
 Revision 1.441.2.1558.2.36  2006/09/28 21:42:55  glen
 - typos (thx sparky)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1558.2.36&r2=1.441.2.1558.2.37&f=u