rpms/mdadm/FC-6 mdadm-2.5.2-static.patch, 1.1, 1.2 mdadm.spec, 1.37, 1.38 sources, 1.15, 1.16 mdadm-1.11.0-default-auto.patch, 1.1, NONE mdadm-2.3.1-fswab64.patch, 1.1, NONE mdadm-2.5.4-guid-printout.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Mar 31 13:34:32 UTC 2007 

Author: dledford

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

Modified Files:
	mdadm-2.5.2-static.patch mdadm.spec sources 
Removed Files:
	mdadm-1.11.0-default-auto.patch mdadm-2.3.1-fswab64.patch 
	mdadm-2.5.4-guid-printout.patch 
Log Message:
* Sat Mar 31 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-1
- Update to latest upstream version
- Minor spec file cleanups


mdadm-2.5.2-static.patch:
 Makefile |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

Index: mdadm-2.5.2-static.patch
===================================================================
RCS file: /cvs/dist/rpms/mdadm/FC-6/mdadm-2.5.2-static.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mdadm-2.5.2-static.patch	7 Jul 2006 19:24:16 -0000	1.1
+++ mdadm-2.5.2-static.patch	31 Mar 2007 13:34:29 -0000	1.2
@@ -1,6 +1,6 @@
---- mdadm-2.5.2/Makefile.static	2006-07-07 14:12:20.000000000 -0400
-+++ mdadm-2.5.2/Makefile	2006-07-07 14:17:54.000000000 -0400
-@@ -141,20 +141,22 @@ $(OBJS) : mdadm.h bitmap.h
+--- mdadm-2.6.1/Makefile.static	2007-03-31 09:31:17.000000000 -0400
++++ mdadm-2.6.1/Makefile	2007-03-31 09:32:08.000000000 -0400
+@@ -146,23 +146,26 @@ $(OBJS) : mdadm.h bitmap.h
  sha1.o : sha1.c sha1.h md5.h
  	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
  
@@ -27,5 +27,10 @@
 -	$(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
 +	$(INSTALL) -D -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
  
- install-man: mdadm.8 md.4 mdadm.conf.5
+-install-man: mdadm.8 md.4 mdadm.conf.5
++install-man: mdadm.8 mdassemble.8 md.4 mdadm.conf.5
  	$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
++	$(INSTALL) -D -m 644 mdassemble.8 $(DESTDIR)$(MAN8DIR)/mdassemble.8
+ 	$(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4
+ 	$(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
+ 


Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/FC-6/mdadm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mdadm.spec	9 Nov 2006 17:43:20 -0000	1.37
+++ mdadm.spec	31 Mar 2007 13:34:29 -0000	1.38
@@ -1,26 +1,26 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     2.5.4
-Release:     3%{?dist}
+Version:     2.6.1
+Release:     1%{?dist}
 Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 Source1:     mdmonitor.init
 Source2:     mdmpd-0.4.tgz
 Source3:     mdmpd.init
-Source4:     mdassemble.8
 Patch:	     mdadm-1.5.0-email.patch
 Patch1:      mdmpd-0.4-node.patch
 Patch2:      mdadm-2.5.2-s390-build.patch
 Patch3:      mdadm-2.5.2-static.patch
-Patch4:      mdadm-2.5.4-guid-printout.patch
 Patch5:      mdadm-2.2-nodiet.patch
 Patch6:      mdadm-2.5.2-cflags.patch
-Patch7:	     mdadm-2.3.1-fswab64.patch
 URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/
 License:     GPL
 Group:       System Environment/Base
 BuildRoot:   %{_tmppath}/%{name}-root
 Obsoletes:   mdctl,raidtools
 Requires:    smtpdaemon
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
 
 %description 
 mdadm is used to create, manage, and monitor Linux MD (software RAID)
@@ -35,10 +35,8 @@
 %patch1 -p1 -b .node
 %patch2 -p1 -b .s390
 %patch3 -p1 -b .static
-%patch4 -p1 -b .printout
 %patch5 -p1 -b .nodiet
 %patch6 -p1 -b .cflags
-#%patch7 -p1 -b .fswab64
 %build
 make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdadm mdadm.static mdassemble.static
 make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd
@@ -48,7 +46,6 @@
 make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin -C mdmpd install
 install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
 install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd
-install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man8/mdassemble.8
 
 mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdmpd
 mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
@@ -57,8 +54,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add mdmonitor
-/sbin/chkconfig --add mdmpd
+if [ "$1" = 1 ]; then
+    /sbin/chkconfig --add mdmonitor
+    /sbin/chkconfig --add mdmpd
+fi
 
 %preun
 if [ "$1" = 0 ]; then
@@ -88,6 +87,10 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Sat Mar 31 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-1
+- Update to latest upstream version
+- Minor spec file cleanups
+
 * Thu Nov 09 2006 Doug Ledford <dledford at redhat.com> - 2.5.4-3
 - Add a fix for the broken printout of array GUID when using the -E --brief
   flags


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mdadm/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	13 Oct 2006 13:30:14 -0000	1.15
+++ sources	31 Mar 2007 13:34:29 -0000	1.16
@@ -1,2 +1,2 @@
 d173fc81f2cc11cb84522fac63e876f1  mdmpd-0.4.tgz
-167f6fe5b55a82766cf397377e080bea  mdadm-2.5.4.tgz
+dd951296208068119132a684d835e18c  mdadm-2.6.1.tgz


--- mdadm-1.11.0-default-auto.patch DELETED ---


--- mdadm-2.3.1-fswab64.patch DELETED ---


--- mdadm-2.5.4-guid-printout.patch DELETED ---

More information about the fedora-cvs-commits mailing list