rpms/mdadm/F-7 mdadm-2.6.2-assemble-ver1-superblock.patch, 1.1, 1.2 mdadm.spec, 1.45, 1.46

[Doug Ledford (dledford)]

Author: dledford

Update of /cvs/extras/rpms/mdadm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21443

Modified Files:
	mdadm-2.6.2-assemble-ver1-superblock.patch mdadm.spec 
Log Message:
* Mon Jul 09 2007 Doug Ledford <dledford at redhat.com> - 2.6.2-4
- Oops, if we call -C -e1, minor_version is no longer properly set, fix that
  up
- Related: bz230207


mdadm-2.6.2-assemble-ver1-superblock.patch:

Index: mdadm-2.6.2-assemble-ver1-superblock.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-7/mdadm-2.6.2-assemble-ver1-superblock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mdadm-2.6.2-assemble-ver1-superblock.patch	3 Jul 2007 20:40:37 -0000	1.1
+++ mdadm-2.6.2-assemble-ver1-superblock.patch	9 Jul 2007 19:03:10 -0000	1.2
@@ -1,5 +1,5 @@
 --- mdadm-2.6.2/super1.c.ver1	2007-05-21 00:25:40.000000000 -0400
-+++ mdadm-2.6.2/super1.c	2007-07-02 16:53:04.000000000 -0400
++++ mdadm-2.6.2/super1.c	2007-07-09 14:19:50.000000000 -0400
 @@ -152,9 +152,17 @@ static void examine_super1(void *sbv, ch
  	char *c;
  	int l = homehost ? strlen(homehost) : 0;
@@ -78,3 +78,11 @@
  
  	free(st);
  	return NULL;
+@@ -1154,6 +1172,7 @@ static __u64 avail_size1(struct supertyp
+ 	devsize -= choose_bm_space(devsize);
+ 
+ 	switch(st->minor_version) {
++	case -1:
+ 	case 0:
+ 		/* at end */
+ 		return ((devsize - 8*2 ) & ~(4*2-1));


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-7/mdadm.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mdadm.spec	6 Jul 2007 16:58:43 -0000	1.45
+++ mdadm.spec	9 Jul 2007 19:03:10 -0000	1.46
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     2.6.2
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 Source1:     mdmonitor.init
 Patch1:      mdadm-2.5.2-s390-build.patch
@@ -89,6 +89,11 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Mon Jul 09 2007 Doug Ledford <dledford at redhat.com> - 2.6.2-4
+- Oops, if we call -C -e1, minor_version is no longer properly set, fix that
+  up
+- Related: bz230207
+
 * Fri Jul 06 2007 Doug Ledford <dledford at redhat.com> - 2.6.2-3
 - Oops, had to update the file leak patch, missed one thing
 - Minor tweak to return codes in init script and add LSB header
@@ -106,7 +111,7 @@
 - Make the mdmonitor script use daemon() correctly
 - Fix a bug where manage mode would not add disks correctly under certain
   conditions
-- Resolves: bz244582, bz242688, bz230207, bz169596, bz171862, bz171938
+- Resolves: bz244582, bz242688, bz230207, bz169516, bz171862, bz171938
 - Resolves: bz174642, bz224272, bz186524
 
 * Mon Jul 02 2007 Doug Ledford <dledford at redhat.com> - 2.6.2-1