Tue Jul 20 16:45:36 UTC 2010

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23783

Modified Files:
	.cvsignore mdadm.spec sources 
Removed Files:
	mdadm-3.1.1-endian.patch mdadm-3.1.2-container-2.patch 
	mdadm-3.1.2-container.patch mdadm-3.1.2-decremental-2.patch 
	mdadm-3.1.2-decremental-3.patch mdadm-3.1.2-decremental.patch 
	mdadm-3.1.2-directory.patch mdadm-3.1.2-mapfile.patch 
	mdadm-3.1.2-mapname.patch mdadm-3.1.2-powerpc-compile.patch 
	mdadm-3.1.2-rebuild.patch 
Log Message:
* Tue Jul 20 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git07202010.1
- Update to latest git repo (3.1.2 plus pending changes, fixes bz602457)
- Add in 64-md-raid.rules to compensate for it no longer being in udev
  (bz581905)
- Remove mdadm.static as its no longer used in initrd creation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30

--- .cvsignore	17 Mar 2010 03:34:43 -0000	1.29
+++ .cvsignore	20 Jul 2010 16:45:35 -0000	1.30
@@ -1,3 +1,4 @@
 mdadm-3.0.3.tar.bz2
 mdadm-3.1.1-gcd9a8b5.tar.bz2
 mdadm-3.1.2.tar.bz2
+mdadm-3.1.3-git07202010.tar.bz2


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- mdadm.spec	13 Apr 2010 23:24:07 -0000	1.94
+++ mdadm.spec	20 Jul 2010 16:45:36 -0000	1.95
@@ -1,23 +1,12 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     3.1.2
-Release:     10%{?dist}
-Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
+Version:     3.1.3
+Release:     0.git07202010.1%{?dist}
+Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-git07202010.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
 Source3:     mdadm.rules
 Source4:     mdadm-raid-check-sysconfig
-Patch1:      mdadm-3.1.2-mapname.patch
-Patch2:      mdadm-3.1.1-endian.patch
-Patch3:      mdadm-3.1.2-mapfile.patch
-Patch4:      mdadm-3.1.2-rebuild.patch
-Patch5:      mdadm-3.1.2-directory.patch
-Patch6:      mdadm-3.1.2-decremental.patch
-Patch7:      mdadm-3.1.2-decremental-2.patch
-Patch8:      mdadm-3.1.2-decremental-3.patch
-Patch9:      mdadm-3.1.2-powerpc-compile.patch
-Patch10:     mdadm-3.1.2-container.patch
-Patch11:     mdadm-3.1.2-container-2.patch
 Patch20:     mdadm-2.5.2-static.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
@@ -38,18 +27,7 @@ almost all functions without a configura
 file can be used to help with some common tasks.
 
 %prep
-%setup -q
-%patch3 -p1 -b .mapfile
-%patch1 -p1 -b .mapname
-%patch2 -p1 -b .endian
-%patch4 -p1 -b .rebuild
-%patch5 -p1 -b .directory
-%patch6 -p1 -b .decremental
-%patch7 -p1 -b .decremental-2
-%patch8 -p1 -b .decremental-3
-%patch9 -p1 -b .powerpc
-%patch10 -p1 -b .container
-%patch11 -p1 -b .container-2
+%setup -q -n mdadm-3.1.3-git07202010
 %patch20 -p1 -b .static
 
 %build
@@ -57,14 +35,12 @@ make %{?_smp_mflags} CXFLAGS="$RPM_OPT_F
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install install-static
-rm -f %{buildroot}/lib/udev/rules.d/*
+make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install
 install -Dp -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/mdmonitor
 install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/99-raid-check
 install -Dp -m 644 %{SOURCE3} %{buildroot}/lib/udev/rules.d/65-md-incremental.rules
 install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/raid-check
 mkdir -p -m 700 %{buildroot}/var/run/mdadm
-ln -s mdadm.8.gz %{buildroot}%{_mandir}/man8/mdadm.static.8.gz
 
 %clean
 rm -rf %{buildroot}
@@ -97,6 +73,12 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Jul 20 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git07202010.1
+- Update to latest git repo (3.1.2 plus pending changes, fixes bz602457)
+- Add in 64-md-raid.rules to compensate for it no longer being in udev
+  (bz581905)
+- Remove mdadm.static as its no longer used in initrd creation
+
 * Tue Apr 13 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-10
 - Minor update to mdadm.rules to make anaconda happy
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	17 Mar 2010 03:34:43 -0000	1.29
+++ sources	20 Jul 2010 16:45:36 -0000	1.30
@@ -1 +1,2 @@
 c5a39f38c465229767a5af2a4eb81bef  mdadm-3.1.2.tar.bz2
+3c1df7259e17ed909ddd4b28e434f10a  mdadm-3.1.3-git07202010.tar.bz2


--- mdadm-3.1.1-endian.patch DELETED ---


--- mdadm-3.1.2-container-2.patch DELETED ---


--- mdadm-3.1.2-container.patch DELETED ---


--- mdadm-3.1.2-decremental-2.patch DELETED ---


--- mdadm-3.1.2-decremental-3.patch DELETED ---


--- mdadm-3.1.2-decremental.patch DELETED ---


--- mdadm-3.1.2-directory.patch DELETED ---


--- mdadm-3.1.2-mapfile.patch DELETED ---


--- mdadm-3.1.2-mapname.patch DELETED ---


--- mdadm-3.1.2-powerpc-compile.patch DELETED ---


--- mdadm-3.1.2-rebuild.patch DELETED ---

