rpms/dmraid/devel pdc_raid10_failure.patch, NONE, 1.1 dmraid.spec, 1.106, 1.107

[Heinz Mauelshagen]

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7946

Modified Files:
	dmraid.spec 
Added Files:
	pdc_raid10_failure.patch 
Log Message:
bz524168: fix pdc metadata format handler to report the proper number of devices in a subset. bz528097: avoid /usr/lib access to DSOs

pdc_raid10_failure.patch:
 pdc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE pdc_raid10_failure.patch ---
diff --git a/lib/format/ataraid/pdc.c.raid10_failure b/lib/format/ataraid/pdc.c
index b0bb652..8b14d71 100644
--- a/lib/format/ataraid/pdc.c
+++ b/lib/format/ataraid/pdc.c
@@ -490,7 +490,9 @@ devices(struct raid_dev *rd, void *context)
 	if (context && pdc->raid.type != PDC_T_SPAN)
 		*((uint64_t *) context) += rd->sectors;
 
-	return pdc->raid.total_disks;
+	return is_raid10(pdc) ?
+	       pdc->raid.total_disks / 2 :
+	       pdc->raid.total_disks;
 }
 
 static int


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- dmraid.spec	21 Sep 2009 14:29:50 -0000	1.106
+++ dmraid.spec	15 Oct 2009 18:30:19 -0000	1.107
@@ -24,6 +24,7 @@ Provides: dmraid-libs = %{version}-%{rel
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
+Patch1: pdc_raid10_failure.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -64,8 +65,11 @@ Device failure reporting has to be activ
 %prep
 %setup -q -n dmraid/%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
+%define _libdir /%{_lib}
+
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 
@@ -130,6 +134,12 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Thu Oct 15 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-4
+- fix pdc metadata format handler to report the correct number
+  of devices in a RAID10 subset
+- bz528097: move libraries to /lib* in order to avoid catch22
+  with unmountable u/usr
+
 * Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-3
 - Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
 - Make -devel Require the main package now the dmraid-libs package is gone