[mdadm/f21] - revert the previous fix, not upstream yet

Dan Horák sharkcz at fedoraproject.org
Mon Aug 4 08:59:05 UTC 2014


commit 3676a4c5d7717a16ecd69e17731be1cadabe1eac
Author: Dan Horák <dan at danny.cz>
Date:   Mon Aug 4 10:58:58 2014 +0200

    - revert the previous fix, not upstream yet

 mdadm.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/mdadm.spec b/mdadm.spec
index f7ace22..1334038 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.3.1
-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
@@ -14,8 +14,6 @@ Source8:     mdadm_event.conf
 
 Patch1:      mdadm-3.3.1-Grow-improve-error-message-is-grow-n2-used-on-Linear.patch
 Patch2:      mdadm-3.3.1-Assemble-Only-fail-auto-assemble-in-face-of-mdadm.co.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1125883
-Patch3:     mdadm-3.3.1-format-argument.patch
 # Fedora customization patches
 Patch97:     mdadm-3.3-udev.patch
 Patch98:     mdadm-2.5.2-static.patch
@@ -44,7 +42,6 @@ file can be used to help with some common tasks.
 
 %patch1 -p1 -b .lineargrow
 %patch2 -p1 -b .autofail
-%patch3 -p1 -b .format
 # Fedora customization patches
 %patch97 -p1 -b .udev
 %patch98 -p1 -b .static
@@ -109,6 +106,9 @@ rm -rf %{buildroot}
 /etc/libreport/events.d/*
 
 %changelog
+* Mon Aug 04 2014 Dan Horák <dan[at]danny.cz> - 3.3.1-5
+- revert the previous fix, not upstream yet
+
 * Mon Aug 04 2014 Dan Horák <dan[at]danny.cz> - 3.3.1-4
 - fix FTBFS on ppc64 (#1125883)
 


More information about the scm-commits mailing list