Obsolete mdadm-sysvinit as we no longer support sysvinit booting
Resolves bz#884993 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
This commit is contained in:
parent
ef87d82060
commit
6093eddf83
22
mdadm.spec
22
mdadm.spec
@ -1,7 +1,7 @@
|
||||
Summary: The mdadm program controls Linux md devices (software RAID arrays)
|
||||
Name: mdadm
|
||||
Version: 3.2.6
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
|
||||
Source1: mdmonitor.init
|
||||
Source2: raid-check
|
||||
@ -25,8 +25,15 @@ License: GPLv2+
|
||||
Group: System Environment/Base
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Obsoletes: mdctl,raidtools
|
||||
%if "%{fedora}" >= "18"
|
||||
Obsoletes: mdadm-sysvinit
|
||||
%endif
|
||||
BuildRequires: systemd-units binutils-devel
|
||||
%if "%{fedora}" <= "17"
|
||||
Requires(post): systemd-units systemd-sysv chkconfig coreutils
|
||||
%else
|
||||
Requires(post): systemd-units chkconfig coreutils
|
||||
%endif
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units coreutils
|
||||
%if "%{fedora}" <= "17"
|
||||
@ -43,6 +50,7 @@ package. However, mdadm is a single program, and it can perform
|
||||
almost all functions without a configuration file, though a configuration
|
||||
file can be used to help with some common tasks.
|
||||
|
||||
%if "%{fedora}" <= "17"
|
||||
%package sysvinit
|
||||
Group: System Environment/Base
|
||||
Summary: SysV init script for mdadm
|
||||
@ -54,6 +62,7 @@ Requires(postun): /sbin/service
|
||||
%description sysvinit
|
||||
SysV style init script for mdadm. It needs to be installed only if systemd
|
||||
is not used as the system init process.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
@ -79,7 +88,9 @@ make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install
|
||||
%if "%{fedora}" <= "17"
|
||||
install -Dp -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/mdmonitor
|
||||
%endif
|
||||
install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/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
|
||||
@ -121,8 +132,10 @@ rm -rf %{buildroot}
|
||||
/sbin/chkconfig --del mdmonitor >/dev/null 2>&1 || :
|
||||
/bin/systemctl try-restart mdmonitor.service >/dev/null 2>&1 || :
|
||||
|
||||
%if "%{fedora}" <= "17"
|
||||
%triggerpostun -n %{name}-sysvinit -- %{name} < 3.2.2-3
|
||||
/sbin/chkconfig --add mdmonitor >/dev/null 2>&1 || :
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
@ -141,10 +154,17 @@ rm -rf %{buildroot}
|
||||
/etc/libreport/events.d/*
|
||||
%endif
|
||||
|
||||
%if "%{fedora}" <= "17"
|
||||
%files sysvinit
|
||||
%{_initrddir}/*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Dec 10 2012 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.2.6-5
|
||||
- mdadm-sysvinit is obsolete given that we no longer support booting
|
||||
using sysvinit scripts
|
||||
- Resolves bz884993
|
||||
|
||||
* Mon Dec 10 2012 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.2.6-4
|
||||
- Fix typo in error message in fix for 880972. No functional changes
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user