rpms/mdadm/devel .cvsignore, 1.23, 1.24 mdadm-2.5.2-static.patch, 1.4, 1.5 mdadm.spec, 1.70, 1.71 raid-check, 1.2, 1.3 sources, 1.23, 1.24

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11876

Modified Files:
	.cvsignore mdadm-2.5.2-static.patch mdadm.spec raid-check 
	sources 
Log Message:
* Mon Jun 29 2009 Doug Ledford <dledford at redhat.com> - 3.0-1
- Remove stale patches already accepted by upstream
- Fix the raid-check script to only try and check a device if it is
  checkable
- Update to official mdadm-3.0 version
- Resolves: bz505587, bz505552



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	18 Mar 2009 18:22:06 -0000	1.23
+++ .cvsignore	29 Jun 2009 19:18:19 -0000	1.24
@@ -12,3 +12,4 @@ mdadm-2.6.7.tar.bz2
 mdadm-2.6.7.1.tar.bz2
 mdadm-3.0-devel2.tar.bz2
 mdadm-3.0-devel3.tar.bz2
+mdadm-3.0.tar.bz2

mdadm-2.5.2-static.patch:

Index: mdadm-2.5.2-static.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm-2.5.2-static.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mdadm-2.5.2-static.patch	12 Feb 2009 15:10:22 -0000	1.4
+++ mdadm-2.5.2-static.patch	29 Jun 2009 19:18:19 -0000	1.5
@@ -20,5 +20,5 @@ Binary files mdadm-3.0-devel2/mdadm.stat
 -	$(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
 +	$(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm.klibc
  
- install-man: mdadm.8 md.4 mdadm.conf.5
+ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
  	$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- mdadm.spec	19 May 2009 17:12:19 -0000	1.70
+++ mdadm.spec	29 Jun 2009 19:18:19 -0000	1.71
@@ -1,16 +1,12 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0
-Release:     0.devel3.7%{?dist}
-Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-devel3.tar.bz2
+Release:     1%{?dist}
+Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
 Source3:     mdadm.rules
 Patch1:      mdadm-2.5.2-static.patch
-Patch2:      mdadm-3.0-cast.patch
-Patch3:      mdadm-3.0-incremental.patch
-Patch4:      mdadm-3.0-mapfile.patch
-Patch5:      mdadm-3.0-foreign.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -30,12 +26,8 @@ almost all functions without a configura
 file can be used to help with some common tasks.
 
 %prep
-%setup -q -n mdadm-3.0-devel3
+%setup -q
 %patch1 -p1 -b .static
-%patch2 -p1 -b .cast
-%patch3 -p1 -b .incremental
-%patch4 -p1 -b .mapfile
-%patch5 -p1 -b .foreign
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@@ -56,14 +48,6 @@ rm -rf $RPM_BUILD_ROOT
 if [ "$1" = 1 ]; then
     /sbin/chkconfig --add mdmonitor
 fi
-# If we are upgrading, the postun for mdmpd will not have deleted the init.d
-# file, so clean the stale file out here.  We should only have to carry this
-# baggage around for a little while before we can assume that the old mdmpd
-# stuff has been cleaned up.
-if [ -x /etc/init.d/mdmpd ]; then
-    service mdmpd stop > /dev/null 2>&1 ||:
-    /sbin/chkconfig --del mdmpd
-fi
 
 %preun
 if [ "$1" = 0 ]; then
@@ -87,6 +71,13 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Mon Jun 29 2009 Doug Ledford <dledford at redhat.com> - 3.0-1
+- Remove stale patches already accepted by upstream
+- Fix the raid-check script to only try and check a device if it is
+  checkable
+- Update to official mdadm-3.0 version
+- Resolves: bz505587, bz505552
+
 * Tue May 19 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel3.7
 - Move the mdadm.map file from /dev/md/ to /dev/ so the installer doesn't
   need to precreate the /dev/md/ directory in order for incremental


Index: raid-check
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/raid-check,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- raid-check	19 May 2009 14:25:55 -0000	1.2
+++ raid-check	29 Jun 2009 19:18:19 -0000	1.3
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 for dev in `grep "^md.*: active" /proc/mdstat | cut -f 1 -d ' '`; do
-	echo "check" > /sys/block/$dev/md/sync_action
+	[ -f /sys/block/$dev/md/sync_action ] && \
+		echo "check" > /sys/block/$dev/md/sync_action
 done
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	18 Mar 2009 18:22:06 -0000	1.23
+++ sources	29 Jun 2009 19:18:19 -0000	1.24
@@ -1 +1 @@
-8cf5b1abb20b2bc33a2bd4b1afbae814  mdadm-3.0-devel3.tar.bz2
+bcd27a1359b18e25e61593221d098f6a  mdadm-3.0.tar.bz2