From c363b2eeed398ccdeb51893eea31a45f322147aa Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jan 27 2016 03:05:33 +0000
Subject: Drop mcelog.cron, cleanup, use parallel make flags


mcelog.cron is commented out altogether but still executable in cron
dirs so it generates useless cron activity and log entries.

Patch by Ville Skyttä updated to apply to latest revision.
https://bugzilla.redhat.com/show_bug.cgi?id=1066659

---

diff --git a/mcelog-disable-cron-job.patch b/mcelog-disable-cron-job.patch
deleted file mode 100644
index ba39490..0000000
--- a/mcelog-disable-cron-job.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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 631a971..0000000
--- a/mcelog-fix-trigger-path-and-cacheing.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 717cd8c..0e71a25 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -13,7 +13,6 @@ Source0:	%{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:	mcelog.conf
 Source2:	mcelog.service
 Source10:	mcelog.setup
-Patch0:		mcelog-fix-trigger-path-and-cacheing.patch
 ExclusiveArch:	i686 x86_64
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -22,24 +21,19 @@ BuildRequires: systemd
 
 %description
 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.
+on x86-32 and x86-64 systems.
 
 %prep
 %autosetup
 
 %build
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}
-
-make CFLAGS="$RPM_OPT_FLAGS -fpie -pie"
+make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" %{?_smp_mflags}
 
 %install
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 install -p -m755 mcelog $RPM_BUILD_ROOT/%{_sbindir}/mcelog
 install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/mcelog.conf
@@ -48,7 +42,6 @@ install -p -m755 triggers/cache-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mce
 install -p -m755 triggers/dimm-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/dimm-error-trigger
 install -p -m755 triggers/page-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/page-error-trigger
 install -p -m755 triggers/socket-memory-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/socket-memory-error-trigger
-install -p -m755 mcelog.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly/mcelog.cron
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/mcelog.service
 install -p -m644 mcelog*.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
@@ -81,13 +74,13 @@ fi
 %{_sysconfdir}/mcelog/triggers
 %config(noreplace) %{_sysconfdir}/mcelog/mcelog.conf
 %{_sysconfdir}/mcelog/mcelog.setup
-%{_sysconfdir}/cron.hourly/mcelog.cron
 %{_unitdir}/mcelog.service
 %{_mandir}/*/*
 
 %changelog
 * Wed Jan 27 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3:119-1
 - Update to latest upstream tag
+- Drop cron job (#1066659)
 
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:101-2.9bfaad8f92c5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild