SPECS (LINUX_2_6): kernel.spec - reiser4 updated.

[pluto]

Author: pluto                        Date: Wed Jun 22 15:35:56 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- reiser4 updated.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1122 -> 1.441.2.1123) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1122 SPECS/kernel.spec:1.441.2.1123
--- SPECS/kernel.spec:1.441.2.1122	Wed Jun 22 16:53:42 2005
+++ SPECS/kernel.spec	Wed Jun 22 17:35:51 2005
@@ -78,6 +78,7 @@
 %define		_e2fsprogs_ver		1.29
 %define		_jfsutils_ver		1.1.3
 %define		_reiserfsprogs_ver	3.6.3
+%define		_reiser4progs_ver	1.0.0
 %define		_xfsprogs_ver		2.6.0
 %define		_pcmcia_cs_ver		3.1.21
 %define		_quota_tools_ver	3.09
@@ -198,7 +199,7 @@
 # http://ifp-driver.sourceforge.net/
 Patch63:	iriverfs-r0.1.0.1.patch
 Patch64:	squashfs2.1-patch
-Patch65:	linux-reiser4-2.6.11-mm4.patch.bz2
+Patch65:	reiser4-2.6.12-mm1.patch
 Patch66:	linux-2.6-alsa-1.0.8-azx.patch
 
 # http://tahoe.pl/patch.htm
@@ -292,6 +293,7 @@
 Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
 Conflicts:	jfsutils < %{_jfsutils_ver}
 Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
+Conflicts:	reiser4progs < %{_reiser4progs_ver}
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
 Conflicts:	quota-tools < %{_quota_tools_ver}
 Conflicts:	PPP < %{_PPP_ver}
@@ -1370,6 +1372,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1123  2005/06/22 15:35:51  pluto
+- reiser4 updated.
+
 Revision 1.441.2.1122  2005/06/22 14:53:42  aniolek
 - updated orinoco patch
 
================================================================

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