- 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
This commit is contained in:
Doug Ledford 2010-07-20 16:45:36 +00:00
parent 03abcff039
commit 91d87d269f

View File

@ -1,23 +1,12 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays) Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm Name: mdadm
Version: 3.1.2 Version: 3.1.3
Release: 10%{?dist} Release: 0.git07202010.1%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-git07202010.tar.bz2
Source1: mdmonitor.init Source1: mdmonitor.init
Source2: raid-check Source2: raid-check
Source3: mdadm.rules Source3: mdadm.rules
Source4: mdadm-raid-check-sysconfig 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 Patch20: mdadm-2.5.2-static.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+ License: GPLv2+
@ -38,18 +27,7 @@ almost all functions without a configuration file, though a configuration
file can be used to help with some common tasks. file can be used to help with some common tasks.
%prep %prep
%setup -q %setup -q -n mdadm-3.1.3-git07202010
%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
%patch20 -p1 -b .static %patch20 -p1 -b .static
%build %build
@ -57,14 +35,12 @@ make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install install-static make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install
rm -f %{buildroot}/lib/udev/rules.d/*
install -Dp -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/mdmonitor install -Dp -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/mdmonitor
install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/99-raid-check 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 %{SOURCE3} %{buildroot}/lib/udev/rules.d/65-md-incremental.rules
install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/raid-check install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/raid-check
mkdir -p -m 700 %{buildroot}/var/run/mdadm mkdir -p -m 700 %{buildroot}/var/run/mdadm
ln -s mdadm.8.gz %{buildroot}%{_mandir}/man8/mdadm.static.8.gz
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -97,6 +73,12 @@ fi
%attr(0700,root,root) %dir /var/run/mdadm %attr(0700,root,root) %dir /var/run/mdadm
%changelog %changelog
* Tue Jul 20 2010 Doug Ledford <dledford@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@redhat.com> - 3.1.2-10 * Tue Apr 13 2010 Doug Ledford <dledford@redhat.com> - 3.1.2-10
- Minor update to mdadm.rules to make anaconda happy - Minor update to mdadm.rules to make anaconda happy