[mdadm/f17] Fix error of F18 systemd macros were pulled into F16/F17 update by mistake

Jes Sorensen jsorensen at fedoraproject.org
Thu Oct 4 16:27:56 UTC 2012


commit b5dc8fd064e86690870cd55b5247daa3e7dea6d4
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Thu Oct 4 17:32:10 2012 +0200

    Fix error of F18 systemd macros were pulled into F16/F17 update by mistake
    
    Signed-off-by: Jes Sorensen <Jes.Sorensen at redhat.com>

 mdadm.spec |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/mdadm.spec b/mdadm.spec
index 948dc4a..88f3b5b 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.2.5
-Release:     9%{?dist}
+Release:     10%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -91,13 +91,21 @@ install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
 rm -rf %{buildroot}
 
 %post
-%systemd_post mdmonitor.service mdmonitor-takeover.service
+if [ $1 -eq 1 ] ; then
+    /bin/systemctl enable mdmonitor.service mdmonitor-takeover.service >/dev/nu
+fi
 
 %preun
-%systemd_preun mdmonitor.service mdmonitor-takeover.service
+if [ $1 = 0 ]; then
+    /bin/systemctl --no-reload disable mdmonitor.service mdmonitor-takeover.ser
+    /bin/systemctl stop mdmonitor.service mdmonitor-takeover.service > /dev/nul
+fi
 
 %postun
-%systemd_postun_with_restart mdmonitor.service
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    /bin/systemctl try-restart mdmonitor.service >/dev/null 2>&1 || :
+fi
 
 %triggerun --  %{name} < 3.2.2-3
 %{_bindir}/systemd-sysv-convert --save mdmonitor >/dev/null 2>&1 || :
@@ -126,6 +134,10 @@ rm -rf %{buildroot}
 %{_initrddir}/*
 
 %changelog
+* Wed Oct 3 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.5-10
+- Fix mistake where Fedora 18 systemd macro changes were incorrectly
+  pulled into the Fedora 16 and Fedora 17 updates of mdadm.
+
 * Wed Oct 3 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.5-9
 - Resolve issue with ambiguous licenses
 - Resolves bz862761


More information about the scm-commits mailing list