From 39460e3c6fe025e04af4b60c7fc1ed1e1f3d2ebdb2ada6382ffc63625b93ea11 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sun, 16 Aug 2020 19:10:07 +0000
Subject: [PATCH] - update to 170:   * mcelog: Add Cometlake client model
 numbers   * mcelog: Do not start mcelog service if edac_mce_amd module is
 loaded   * mcelog: Decode and print stepping from cpuid   * mcelog: Add
 "kflags" field to "struct mce"   * Add reporter tracking to trigger-invoking
 functions.   * mcelog: Add decode for MCi_MISC from 10nm memory controller

OBS-URL: https://build.opensuse.org/package/show/Base:System/mcelog?expand=0&rev=81
---
 mcelog-1.66.tar.xz |  3 ---
 mcelog-170.tar.gz  |  3 +++
 mcelog.changes     | 11 +++++++++++
 mcelog.spec        | 18 +++++++++---------
 4 files changed, 23 insertions(+), 12 deletions(-)
 delete mode 100644 mcelog-1.66.tar.xz
 create mode 100644 mcelog-170.tar.gz

diff --git a/mcelog-1.66.tar.xz b/mcelog-1.66.tar.xz
deleted file mode 100644
index 552279a..0000000
--- a/mcelog-1.66.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c34d02513aa760296f4932c1d21ce0ba349961b8ded5736b1b75d4a6d492348
-size 280796
diff --git a/mcelog-170.tar.gz b/mcelog-170.tar.gz
new file mode 100644
index 0000000..3c6f296
--- /dev/null
+++ b/mcelog-170.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8eb238b4c766c0c8b5a3263558cf9e04b19d1ed9a712ee0d3d1d583c1421bb96
+size 312911
diff --git a/mcelog.changes b/mcelog.changes
index 2569b6d..7078e7b 100644
--- a/mcelog.changes
+++ b/mcelog.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Aug 16 19:01:17 UTC 2020 - Dirk Mueller <dmueller@suse.com>
+
+- update to 170:
+  * mcelog: Add Cometlake client model numbers
+  * mcelog: Do not start mcelog service if edac_mce_amd module is loaded
+  * mcelog: Decode and print stepping from cpuid
+  * mcelog: Add "kflags" field to "struct mce"
+  * Add reporter tracking to trigger-invoking functions.
+  * mcelog: Add decode for MCi_MISC from 10nm memory controller 
+
 -------------------------------------------------------------------
 Wed Nov 20 14:00:53 UTC 2019 - trenn@suse.de
 
diff --git a/mcelog.spec b/mcelog.spec
index 1caab7e..5c1c38c 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mcelog
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,17 +18,16 @@
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-
 Name:           mcelog
-Version:        1.66
+Version:        170
 Release:        0
 Summary:        Log Machine Check Events
 License:        GPL-2.0-only
 Group:          System/Monitoring
-Url:            http://www.mcelog.org/
-Source:         %{name}-%{version}.tar.xz
+URL:            https://mcelog.org/
+Source:         https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/mcelog-%{version}.tar.gz
 Source2:        mcelog.sysconfig
 Source3:        mcelog.systemd
 Source5:        mcelog.tmpfiles
@@ -46,11 +45,11 @@ Patch10:        patches/add-f16h-support.patch
 Patch11:        mcelog-socket-path.patch
 Patch12:        fix_setgroups_missing_call.patch
 BuildRequires:  libesmtp-devel
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(systemd)
 Requires:       logrotate
 Requires(pre):  %fillup_prereq
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch:  %ix86 x86_64
+ExclusiveArch:  %{ix86} x86_64
 %{?systemd_requires}
 
 %description
@@ -66,7 +65,8 @@ In addition, it allows decoding machine check kernel panic messages.
 %autosetup
 
 %build
-make %{?_smp_mflags} CFLAGS="%{optflags} -fpie -pie"
+echo "%{version}" > .os_version
+%make_build CFLAGS="%{optflags} -fpie -pie"
 
 %install
 export prefix=%{buildroot}%{_prefix}