From 0b89cc8fcb8b39f63110321e446410fbc7564420 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2015 03:41:12 +0000
Subject: import edac-utils-0.16-14.el7


---

diff --git a/SOURCES/edac_utils-do_not_exit_if_dmidecode_isnt_found.patch b/SOURCES/edac_utils-do_not_exit_if_dmidecode_isnt_found.patch
new file mode 100644
index 0000000..0ad3105
--- /dev/null
+++ b/SOURCES/edac_utils-do_not_exit_if_dmidecode_isnt_found.patch
@@ -0,0 +1,28 @@
+commit 7629ebb853687afe144987d301d77a4ff99c65b5
+Author: Mark A. Grondona <mgrondona@llnl.gov>
+Date:   Mon Sep 28 17:49:15 2009 +0000
+
+    Don't make missing dmidecode a fatal error.
+
+diff --git a/src/util/edac-ctl.in b/src/util/edac-ctl.in
+index 5bab397..e0c169e 100755
+--- a/src/util/edac-ctl.in
++++ b/src/util/edac-ctl.in
+@@ -30,7 +30,7 @@ use Getopt::Long;
+ 
+ my $prefix      = "@prefix@";
+ my $sysconfdir  = "@sysconfdir@";
+-my $dmidecode   = find_prog ("dmidecode") or exit (1);
++my $dmidecode   = find_prog ("dmidecode");
+ my $modprobe    = find_prog ("modprobe")  or exit (1);
+ 
+ my %conf        = ();
+@@ -392,7 +392,7 @@ sub find_prog
+     for my $dir ("/sbin", "/usr/sbin", split ':', $ENV{PATH}) {
+         return "$dir/$file" if -x "$dir/$file";
+     }
+-    log_error ("Failed to find $file in PATH\n");
++    # log_error ("Failed to find $file in PATH\n");
+     return "";
+ }
+ 
diff --git a/SOURCES/edac_utils-dont_try_to_use_dmidecode_if_not_installed.patch b/SOURCES/edac_utils-dont_try_to_use_dmidecode_if_not_installed.patch
new file mode 100644
index 0000000..5878438
--- /dev/null
+++ b/SOURCES/edac_utils-dont_try_to_use_dmidecode_if_not_installed.patch
@@ -0,0 +1,15 @@
+---
+ src/util/edac-ctl.in |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- edac-utils-0.16.orig/src/util/edac-ctl.in	2015-10-05 09:50:44.216884955 -0400
++++ edac-utils-0.16/src/util/edac-ctl.in	2015-10-05 11:11:41.451961491 -0400
+@@ -166,6 +166,8 @@ sub guess_vendor_model_dmidecode {
+     my ($vendor, $model);
+     my $line = 0;
+ 
++    return ('Unknown', 'Unknown') unless $dmidecode;
++
+     $< == 0 || die "Must be root to run dmidecode\n";
+ 
+     open (DMI, "$dmidecode |") or die "failed to run $dmidecode: $!\n";
diff --git a/SPECS/edac-utils.spec b/SPECS/edac-utils.spec
index 7518fd0..5a4982f 100644
--- a/SPECS/edac-utils.spec
+++ b/SPECS/edac-utils.spec
@@ -1,16 +1,18 @@
 Name:		edac-utils
 Version:	0.16
-Release:	8%{?dist}
+Release:	14%{?dist}
 Summary:	Userspace helper for kernel EDAC drivers
 
 Group:		System Environment/Base
 License:	GPLv2+
 URL:		http://sourceforge.net/projects/edac-utils/
 
-ExclusiveArch:	%{ix86} x86_64 %{arm}
+ExclusiveArch:	%{ix86} x86_64 %{arm} aarch64 %{power64}
 Source0:	http://dl.sourceforge.net/sourceforge/edac-utils/%{name}-%{version}.tar.bz2
 Source1:	edac.service
 Patch:		884477.patch
+Patch2:		edac_utils-do_not_exit_if_dmidecode_isnt_found.patch
+Patch3:		edac_utils-dont_try_to_use_dmidecode_if_not_installed.patch
 
 %ifarch %{ix86} x86_64
 Requires:	dmidecode
@@ -42,6 +44,8 @@ for %{name}.
 %prep
 %setup -q
 %patch -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure --disable-static
@@ -104,6 +108,24 @@ fi
 %{_includedir}/edac.h
 
 %changelog
+* Mon Oct 05 2015 Aristeu Rozanski <aris@redhat.com> - 0.16-14
+- Don't try to use dmidecode if not installed [1125491]
+
+* Mon Oct 05 2015 Aristeu Rozanski <aris@redhat.com> - 0.16-13
+- Do not exit if dmidecode isn't found [1125491]
+
+* Tue May 05 2015 Aristeu Rozanski <aris@redhat.com> - 0.16-12
+- Rebuilt for 7.2 [1184674]
+
+* Fri Aug 22 2014 Aristeu Rozanski <aris@redhat.com> - 0.16-11
+- Enable in all powerpc64 arches instead [1125491]
+
+* Fri Aug 08 2014 Aristeu Rozanski <aris@redhat.com> - 0.16-10
+- Enable ppc64le arch build [1125491]
+
+* Tue Jun 03 2014 Aristeu Rozanski <aris@redhat.com> - 0.16-9
+- Enable builds on aarch64 [967931]
+
 * Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.16-8
 - Mass rebuild 2013-12-27