rpms/mdadm/devel mdadm-2.2-nodiet.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 mdadm.spec, 1.23, 1.24 sources, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/mdadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7708

Modified Files:
	.cvsignore mdadm.spec sources 
Added Files:
	mdadm-2.2-nodiet.patch 
Log Message:
- 2.2 upgrade (#167897)
- disable diet because we don't ship it anymore
  and we don't actually use mdassemble now


mdadm-2.2-nodiet.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mdadm-2.2-nodiet.patch ---
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
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 May 2005 15:26:33 -0000	1.10
+++ .cvsignore	5 Dec 2005 17:03:56 -0000	1.11
@@ -1,3 +1,2 @@
 mdmpd-0.4.tgz
-mdadm-1.9.0.tgz
-mdadm-1.11.0.tgz
+mdadm-2.2.tar.bz2


Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mdadm.spec	16 May 2005 22:03:20 -0000	1.23
+++ mdadm.spec	5 Dec 2005 17:03:56 -0000	1.24
@@ -1,8 +1,8 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     1.11.0
-Release: 4.fc4
-Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
+Version:     2.2
+Release:     1.fc5
+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 @@
 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 @@
 %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/mdadm
 
 %clean
-[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add mdmonitor
@@ -73,7 +75,7 @@
 
 %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 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Mon Dec 05 2005 Warren Togami <wtogami at 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 at 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)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 May 2005 15:26:33 -0000	1.10
+++ sources	5 Dec 2005 17:03:56 -0000	1.11
@@ -1,2 +1,2 @@
 d173fc81f2cc11cb84522fac63e876f1  mdmpd-0.4.tgz
-209a3fede9d61326fe5cf8125665b3c4  mdadm-1.11.0.tgz
+c8df672f809aa4a43a88a2516d421d6e  mdadm-2.2.tar.bz2