From c691b9569de3741b81930656f3ae5e00649a7e04 Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Mon, 12 Aug 2013 19:25:21 -0400
Subject: [PATCH] Updated the following ...

- updated to latest mcelog
- removed mcelog-fix-trigger-path-and-cacheing.patch. AFAICT triggers are
  correctly installed
- added mcelog-disable-cron-job.patch as mcelog runs in daemon mode by
  default in Fedora
---
 .gitignore                                 |  1 +
 mcelog-disable-cron-job.patch              | 10 +++++++++
 mcelog-fix-trigger-path-and-cacheing.patch | 24 ----------------------
 mcelog.spec                                | 14 +++++++++----
 sources                                    |  2 +-
 5 files changed, 22 insertions(+), 29 deletions(-)
 create mode 100644 mcelog-disable-cron-job.patch
 delete mode 100644 mcelog-fix-trigger-path-and-cacheing.patch

diff --git a/.gitignore b/.gitignore
index 9f7722b..998870c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mcelog-1.0pre3.tar.bz2
 /mcelog-6e4e2a00.tar.bz2
+/mcelog-f0d7654.tar.bz2
diff --git a/mcelog-disable-cron-job.patch b/mcelog-disable-cron-job.patch
new file mode 100644
index 0000000..ba39490
--- /dev/null
+++ b/mcelog-disable-cron-job.patch
@@ -0,0 +1,10 @@
+diff --git a/mcelog.cron b/mcelog.cron
+index 4335caa..b40527a 100755
+--- a/mcelog.cron
++++ b/mcelog.cron
+@@ -1,2 +1,4 @@
+ #!/bin/bash
+-/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog
++# Disabled by default on Fedora since this is run as daemon
++# using the mcelog.service systemd configuration entries.
++#/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog
diff --git a/mcelog-fix-trigger-path-and-cacheing.patch b/mcelog-fix-trigger-path-and-cacheing.patch
deleted file mode 100644
index 6df6feb..0000000
--- a/mcelog-fix-trigger-path-and-cacheing.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile b/Makefile
-index fcfd0da..5893ce4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -57,7 +57,7 @@ install: mcelog
- 	install -m 644 -p mcelog.8 ${prefix}/share/man/man8
- 	install -m 644 -p -b mcelog.conf ${etcprefix}/etc/mcelog/mcelog.conf
- 	for i in ${TRIGGERS} ; do 						\
--		install -m 755 -p -b triggers/$$i ${etcprefix}/etc/mcelog ; 	\
-+		install -m 755 -p -b triggers/$$i ${etcprefix}/etc/mcelog/triggers ; 	\
- 	done
- ifdef DOCDIR
- 	install -m 644 -p ${DOC} ${DOCDIR} 
-diff --git a/mcelog.cron b/mcelog.cron
-index 4335caa..317b699 100755
---- a/mcelog.cron
-+++ b/mcelog.cron
-@@ -1,2 +1,5 @@
- #!/bin/bash
--/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog
-+
-+# Disabled by default on Fedora since this is run as daemon
-+# using the mcelog.service systemd configuration entries.
-+#/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog
diff --git a/mcelog.spec b/mcelog.spec
index 8940810..a01d6cc 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -1,9 +1,9 @@
-%define	last_git_commit 6e4e2a00
+%define	last_git_commit f0d7654
 
 Summary:	Tool to translate x86-64 CPU Machine Check Exception data
 Name:		mcelog
 Version:	1.0
-Release:	0.9.%{last_git_commit}%{?dist}
+Release:	0.10.%{last_git_commit}%{?dist}
 Epoch:		2
 Group:		System Environment/Base
 License:	GPLv2
@@ -11,7 +11,7 @@ Source0:	mcelog-%{last_git_commit}.tar.bz2
 Source1:	mcelog.conf
 Source2:	mcelog.service
 Source10:	mcelog.setup
-Patch0:		mcelog-fix-trigger-path-and-cacheing.patch
+Patch0:		mcelog-disable-cron-job.patch
 URL:		https://github.com/andikleen/mcelog.git
 
 ExclusiveArch:	i686 x86_64
@@ -26,7 +26,7 @@ on x86-32 and x86-64 systems. It can be run either as a daemon, or by cron.
 
 %prep
 %setup -q -n %{name}-%{last_git_commit}
-%patch0 -p1 -b .fix-triggers-and-cacheing
+%patch0 -p1 -b .disable-cron-job
 
 %build
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
@@ -82,6 +82,12 @@ fi
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Mon Aug 12 2013 Prarit Bhargava <prarit@redhat.com> 2:1.0-0.10.f0d7654
+- updated to latest mcelog
+- removed mcelog-fix-trigger-path-and-cacheing.patch. AFAICT triggers are
+  correctly installed
+- added mcelog-disable-cron-job.patch as mcelog runs in daemon mode by
+  default in Fedora
 * Sun Aug  4 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2:1.0-0.9.6e4e2a00
 - Fix FBTFS, modernise spec
 
diff --git a/sources b/sources
index 393ba57..6a333b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-439060e241b2181a694e2ee3b00b9d68  mcelog-6e4e2a00.tar.bz2
+c9d57ec90fb53b873b7580f78c88dd20  mcelog-f0d7654.tar.bz2