From a75e28c3c30ddbc1a802aba28155933091c1a3e5 Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Thu, 17 Nov 2011 18:06:12 -0500
Subject: [PATCH] - Updated sources to deal with various warning issues
 [701083] [704302] - Update URL for new location of Andi's mcelog tree -
 Update n-v-r to include latest git hash

---
 .gitignore                                 |  1 +
 mcelog-fix-trigger-path-and-cacheing.patch | 24 +++++++++++++++++++
 mcelog.spec                                | 27 +++++++++++++---------
 sources                                    |  2 +-
 4 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 mcelog-fix-trigger-path-and-cacheing.patch

diff --git a/.gitignore b/.gitignore
index b410953..9f7722b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mcelog-1.0pre3.tar.bz2
+/mcelog-6e4e2a00.tar.bz2
diff --git a/mcelog-fix-trigger-path-and-cacheing.patch b/mcelog-fix-trigger-path-and-cacheing.patch
new file mode 100644
index 0000000..6df6feb
--- /dev/null
+++ b/mcelog-fix-trigger-path-and-cacheing.patch
@@ -0,0 +1,24 @@
+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 f1c4edb..5814ce0 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -1,19 +1,19 @@
-%define pre_release pre3
+%define	last_git_commit 6e4e2a00
 
-Summary:        Tool to translate x86-64 CPU Machine Check Exception data.
-Name:           mcelog
+Summary:	Tool to translate x86-64 CPU Machine Check Exception data.
+Name:		mcelog
 Version:	1.0
-Release:	0.3.%{pre_release}%{?dist}
+Release:	0.3.%{last_git_commit}%{?dist}
 Epoch:		2
-Group:          System Environment/Base
-License:        GPLv2
-Source0:        http://www.kernel.org/pub/linux/utils/cpu/mce/mcelog-%{version}%{pre_release}.tar.bz2
+Group:		System Environment/Base
+License:	GPLv2
+Source0:	mcelog-%{last_git_commit}.tar.bz2
 Source1:	mcelog.conf
 Source2:	mcelog.service
 Source10:	mcelog.setup
-Patch0:		mcelog-1.0pre3-fix-trigger-path-and-cacheing.patch
-URL:            http://www.kernel.org/pub/linux/utils/cpu/mce/
-Buildroot:      %{_tmppath}/%{name}-%{version}-root
+Patch0:		mcelog-fix-trigger-path-and-cacheing.patch
+URL:		https://github.com/andikleen/mcelog.git
+Buildroot:	%{_tmppath}/%{name}-%{version}-root
 ExclusiveArch:	i686 x86_64
 
 %description
@@ -21,7 +21,7 @@ mcelog is a utility that collects and decodes Machine Check Exception data
 on x86-32 and x86-64 systems. It can be run either as a daemon, or by cron.
 
 %prep
-%setup -q -n %{name}-%{version}%{pre_release}
+%setup -q -n %{name}-%{last_git_commit}
 %patch0 -p1 -b .fix-triggers-and-cacheing
 
 %build
@@ -83,6 +83,11 @@ fi
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Thu Nov 17 2011 Prarit Bhargava <prarit@redhat.com> 2:1.0-0.3.6e4e2a00
+- Updated sources to deal with various warning issues [701083] [704302]
+- Update URL for new location of Andi's mcelog tree
+- Update n-v-r to include latest git hash
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:1.0-0.3.pre3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b9cdd7b..393ba57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dbdf6507eb34ebc4ce7c583ef6c568c5  mcelog-1.0pre3.tar.bz2
+439060e241b2181a694e2ee3b00b9d68  mcelog-6e4e2a00.tar.bz2