From e2e8e9cb3b39fdb1aaa2dbac04e2a04e40c96f63 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2015 03:51:08 +0000
Subject: import udisks2-2.1.2-6.el7


---

diff --git a/SOURCES/udisks-2.1.2-intel_raid.patch b/SOURCES/udisks-2.1.2-intel_raid.patch
new file mode 100644
index 0000000..81e3787
--- /dev/null
+++ b/SOURCES/udisks-2.1.2-intel_raid.patch
@@ -0,0 +1,14 @@
+diff -up udisks-2.1.2/udisks/udisksclient.c.intel_raid udisks-2.1.2/udisks/udisksclient.c
+--- udisks-2.1.2/udisks/udisksclient.c.intel_raid	2015-05-13 12:15:09.979557171 +0200
++++ udisks-2.1.2/udisks/udisksclient.c	2015-05-13 12:17:51.240957992 +0200
+@@ -1936,8 +1936,8 @@ static const struct
+   {"raid",       "linux_raid_member", NULL,    NC_("fs-type", "Linux RAID Member"),                 NC_("fs-type", "Linux RAID Member")},
+   {"raid",       "zfs_member",        "*",     NC_("fs-type", "ZFS Device (ZPool version %s)"),     NC_("fs-type", "ZFS (v%s)")},
+   {"raid",       "zfs_member",        NULL,    NC_("fs-type", "ZFS Device"),                        NC_("fs-type", "ZFS")},
+-  {"raid",       "isw_raid_member",   "*",     NC_("fs-type", "Intel Matrix RAID Member (version %s)"), NC_("fs-type", "IMSM RAID Member (%s)")},
+-  {"raid",       "isw_raid_member",   NULL,    NC_("fs-type", "Intel Matrix RAID Member"),          NC_("fs-type", "IMSM RAID")},
++  {"raid",       "isw_raid_member",   "*",     NC_("fs-type", "Intel Rapid Storage Technology enterprise RAID Member (version %s)"), NC_("fs-type", "Intel RSTe RAID Member (%s)")},
++  {"raid",       "isw_raid_member",   NULL,    NC_("fs-type", "Intel Rapid Storage Technology enterprise RAID Member"), NC_("fs-type", "Intel RSTe RAID Member")},
+   {"crypto",     "crypto_LUKS",       "*",     NC_("fs-type", "LUKS Encryption (version %s)"),      NC_("fs-type", "LUKS")},
+   {"crypto",     "crypto_LUKS",       NULL,    NC_("fs-type", "LUKS Encryption"),                   NC_("fs-type", "LUKS")},
+   {"filesystem", "VMFS",              "*",     NC_("fs-type", "VMFS (version %s)"),                 NC_("fs-type", "VMFS (v%s)")},
diff --git a/SPECS/udisks2.spec b/SPECS/udisks2.spec
index 6b2c3e3..7d70993 100644
--- a/SPECS/udisks2.spec
+++ b/SPECS/udisks2.spec
@@ -8,7 +8,7 @@
 Summary: Disk Manager
 Name: udisks2
 Version: 2.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -96,6 +96,10 @@ Patch14: udisks-2.1.3-uninitialized-wait_data.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1070144
 Patch15: udisks-2.x.x-CVE-2014-0004.patch
 
+# Rename the Intel SW RAID
+# https://bugzilla.redhat.com/show_bug.cgi?id=1175225
+Patch16: udisks-2.1.2-intel_raid.patch
+
 %description
 udisks provides a daemon, D-Bus API and command line tools for
 managing disks and storage devices. This package is for the udisks 2.x
@@ -133,6 +137,7 @@ daemon. This package is for the udisks 2.x series.
 %patch13 -p1 -b .uninitialized-vars
 %patch14 -p1 -b .uninitialized-wait_data
 %patch15 -p1 -b .cve-2014-0004
+%patch16 -p1 -b .intel_raid
 
 %build
 # umount.udisks2-manpage.patch touches Makefile.am
@@ -202,6 +207,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Wed May 13 2015 Tomas Smetana <tsmetana@redhat.com> - 2.1.2-6
+- Rename the Intel SW RAID (#1175225)
+- Resolves: rhbz#1175225
+
 * Wed Feb 26 2014 Jan Safranek <jsafrane@redhat.com> - 2.1.2-5
 - Fix CVE-2014-0004: stack-based buffer overflow when handling long path names
   (#1070144)