- Comment out the incremental assembly rules from the main udev rule file

so we can control it in our own incremental assembly specific rule file
- Don't build the static package, we don't install it, also remove the
    glibc-static buildreq

mdadm-3.1.3-udev.patch

@@ -0,0 +1,15 @@
+--- mdadm-3.1.3-git20100722/udev-md-raid.rules.no-incremental	2010-07-22 12:11:39.188967623 -0400
++++ mdadm-3.1.3-git20100722/udev-md-raid.rules	2010-07-22 12:12:24.298092552 -0400
+@@ -3,8 +3,10 @@
+ SUBSYSTEM!="block", GOTO="md_end"
+ 
+ # handle potential components of arrays
+-ENV{ID_FS_TYPE}=="linux_raid_member", ACTION=="remove", RUN+="/sbin/mdadm -If $name"
+-ENV{ID_FS_TYPE}=="linux_raid_member", ACTION=="add", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
++# Note: in Fedora we handle incremental assembly in 65-incremental.rules so
++#       we can do things like honor anaconda install options
++#ENV{ID_FS_TYPE}=="linux_raid_member", ACTION=="remove", RUN+="/sbin/mdadm -If $name"
++#ENV{ID_FS_TYPE}=="linux_raid_member", ACTION=="add", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
+ 
+ # handle md arrays
+ ACTION!="add|change", GOTO="md_end"

mdadm.spec

@@ -1,12 +1,13 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.1.3
-Release:     0.git20100722.1%{?dist}
+Release:     0.git20100722.2%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-git20100722.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
 Source3:     mdadm.rules
 Source4:     mdadm-raid-check-sysconfig
+Patch19:     mdadm-3.1.3-udev.patch
 Patch20:     mdadm-2.5.2-static.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
@@ -17,7 +18,6 @@ Requires(post): /sbin/service, /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 Requires: udev
-BuildRequires: glibc-static
 
 %description 
 The mdadm program is used to create, manage, and monitor Linux MD (software
@@ -28,10 +28,11 @@ file can be used to help with some common tasks.
 
 %prep
 %setup -q -n mdadm-3.1.3-git20100722
+%patch19 -p1 -b .udev
 %patch20 -p1 -b .static
 
 %build
-make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
+make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon
 
 %install
 rm -rf %{buildroot}
@@ -73,6 +74,12 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Thu Jul 22 2010 Doug Ledford <dledford@redhat.com> - 3.1.3-0.git20100722.2
+- Comment out the incremental assembly rules from the main udev rule file
+  so we can control it in our own incremental assembly specific rule file
+- Don't build the static package, we don't install it, also remove the
+  glibc-static buildreq
+
 * Thu Jul 22 2010 Doug Ledford <dledford@redhat.com> - 3.1.3-0.git20100722.1
 - Change git date format to the correct format (YYYYMMDD)
 - Update to latest upstream push (fixes bz604023)