- 2.2 upgrade (#167897)

- disable diet because we don't ship it anymore and we don't actually use
    mdassemble now

.cvsignore

@@ -1,3 +1,2 @@
 mdmpd-0.4.tgz
-mdadm-1.9.0.tgz
+mdadm-2.2.tar.bz2
-mdadm-1.11.0.tgz

mdadm-2.2-nodiet.patch

@@ -0,0 +1,12 @@
+diff -urN mdadm-2.2.orig/Makefile mdadm-2.2/Makefile
+--- mdadm-2.2.orig/Makefile	2005-12-05 11:52:31.000000000 -0500
++++ mdadm-2.2/Makefile	2005-12-05 11:52:46.000000000 -0500
+@@ -31,7 +31,7 @@
+ # e.g.  make CXFLAGS=-O to optimise
+ TCC = tcc
+ UCLIBC_GCC = $(shell for nm in i386-uclibc-linux-gcc i386-uclibc-gcc; do which $$nm > /dev/null && { echo $$nm ; exit; } ; done; echo false No uclibc found )
+-DIET_GCC = diet gcc
++DIET_GCC = gcc
+ 
+ KLIBC=/home/src/klibc/klibc-0.77
+ 

mdadm.spec

@@ -1,8 +1,8 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     1.11.0
+Version:     2.2
-Release: 4.fc4
+Release:     1.fc5
-Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
+Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     mdmpd-0.4.tgz
 Source3:     mdmpd.init
@@ -11,6 +11,7 @@ Patch:	     mdadm-1.5.0-email.patch
 Patch2:      mdadm-1.9.0-s390-build.patch
 Patch3:      mdadm-1.9.0-static-make.patch
 Patch4:      mdadm-1.11.0-default-auto.patch
+Patch5:      mdadm-2.2-nodiet.patch
 URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/
 License:     GPL
 Group:       System Environment/Base
@@ -31,6 +32,7 @@ file can be used to help with some common tasks.
 %patch2 -p1 -b .s390
 %patch3 -p1 -b .static
 %patch4 -p1 -b .auto
+%patch5 -p1 -b .nodiet
 
 %build
 make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdadm.static mdassemble.static
@@ -47,7 +49,7 @@ mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdmpd
 mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
 
 %clean
-[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add mdmonitor
@@ -73,7 +75,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc ANNOUNCE-* TODO ChangeLog mdadm.conf-example COPYING INSTALL misc/*
+%doc ANNOUNCE-* TODO ChangeLog mdadm.conf-example COPYING misc/*
 /sbin/*
 %{_initrddir}/*
 %{_mandir}/man*/md*
@@ -81,6 +83,11 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Mon Dec 05 2005 Warren Togami <wtogami@redhat.com> 2.2-1
+- 2.2 upgrade (#167897)
+- disable diet because we don't ship it anymore
+  and we don't actually use mdassemble now
+
 * Mon May 16 2005 Doug Ledford <dledford@redhat.com> 1.11.0-4.fc4
 - Make the mdmonitor init script use the pid-file option, major cleanup
   of the script now possible (#134459)

sources

@@ -1,2 +1,2 @@
 d173fc81f2cc11cb84522fac63e876f1  mdmpd-0.4.tgz
-209a3fede9d61326fe5cf8125665b3c4  mdadm-1.11.0.tgz
+c8df672f809aa4a43a88a2516d421d6e  mdadm-2.2.tar.bz2