rpms/mdadm/devel mdadm-3.1.2-powerpc-compile.patch, NONE, 1.1 mdadm.spec, 1.87, 1.88

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13737

Modified Files:
	mdadm.spec 
Added Files:
	mdadm-3.1.2-powerpc-compile.patch 
Log Message:
* Tue Apr 06 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-4
- One line fix for ppc64 compiles


mdadm-3.1.2-powerpc-compile.patch:
 super-intel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mdadm-3.1.2-powerpc-compile.patch ---
commit 995511f26e8d661d32d1c3fc42a08960989d1e6d
Author: Doug Ledford <dledford at redhat.com>
Date:   Tue Apr 6 14:04:30 2010 -0400

    powerpc compile fix
    
    Signed-off-by: Doug Ledford <dledford at redhat.com>

diff --git a/super-intel.c b/super-intel.c
index a196ca3..999b970 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -697,7 +697,7 @@ static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx)
 		printf(" <-- %s", map_state_str[map->map_state]);
 		printf("\n     Checkpoint : %u (%llu)",
 		       __le32_to_cpu(dev->vol.curr_migr_unit),
-		       blocks_per_migr_unit(dev));
+		       (unsigned long long)blocks_per_migr_unit(dev));
 	}
 	printf("\n");
 	printf("    Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean");


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- mdadm.spec	6 Apr 2010 16:32:12 -0000	1.87
+++ mdadm.spec	6 Apr 2010 18:18:45 -0000	1.88
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.1.2
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -14,6 +14,7 @@ Patch4:      mdadm-3.1.2-rebuild.patch
 Patch5:      mdadm-3.1.2-directory.patch
 Patch6:      mdadm-3.1.2-decremental.patch
 Patch7:      mdadm-3.1.2-decremental-2.patch
+Patch8:      mdadm-3.1.2-powerpc-compile.patch
 Patch9:      mdadm-2.5.2-static.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
@@ -42,6 +43,7 @@ file can be used to help with some commo
 %patch5 -p1 -b .directory
 %patch6 -p1 -b .decremental
 %patch7 -p1 -b .decremental-2
+%patch8 -p1 -b .powerpc
 %patch9 -p1 -b .static
 
 %build
@@ -89,6 +91,9 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Apr 06 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-4
+- One line fix for ppc64 compiles
+
 * Tue Apr 06 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-3
 - Clean up directory mess once and for all
 - Add incremental remove support