import mcelog-162-2.el8

.gitignore

@@ -1 +1 @@
-SOURCES/v159.zip
+SOURCES/mcelog-162.zip

.mcelog.metadata

@@ -1 +1 @@
-b1f9a234ea931f9b7d7a0f919ad8a1fc849ada80 SOURCES/v159.zip
+28df86eab946aabf050e1fe6868a321f33bde1d5 SOURCES/mcelog-162.zip

SOURCES/mcelog-annocheck-gcc-flags.patch

@@ -0,0 +1,19 @@
+diff --git a/Makefile b/Makefile
+index d28d17a24aea..c6603251be31 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,5 @@
+ CFLAGS := -g -Os
++LDFLAGS = -Wl,-z,now -pie
+ prefix := /usr
+ etcprefix :=
+ MANDIR := ${prefix}/share/man
+@@ -82,7 +83,7 @@ dbquery: db.o dbquery.o memutil.o
+ depend: .depend
+ 
+ %.o: %.c
+-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(ADD_DEFINES) -o $@ $<
++	$(CC) $(LDFLAGS) -c $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(ADD_DEFINES) -o $@ $<
+ 
+ version.tmp: FORCE
+ 	( printf "char version[] = \"" ; 			\

SPECS/mcelog.spec

@@ -1,15 +1,16 @@
 Summary:	Tool to translate x86-64 CPU Machine Check Exception data
 Name:		mcelog
-Version:	159
-Release:	1%{?dist}
+Version:	162
+Release:	2%{?dist}
 Epoch:		3
 Group:		System Environment/Base
 License:	GPLv2
 URL:		https://github.com/andikleen/mcelog
-Source0:	%{url}/archive/v%{version}.zip
+Source0:	%{url}/archive/mcelog-%{version}.zip
 # note that this source OVERRIDES the one on the tarball above!
 Source1:	mcelog.conf
 Source2:	mcelog.service
+Patch0:		mcelog-annocheck-gcc-flags.patch
 ExclusiveArch:	i686 x86_64
 Requires(post): systemd
 Requires(preun): systemd
@@ -24,6 +25,11 @@ on x86-32 and x86-64 systems.
 %autosetup
 
 %build
+%set_build_flags
+
+# automatically populate the .os_version file so that "mcelog --version"
+# returns a valid value instead of "unknown"
+echo "%{version}-%{release}" > .os_version
 make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" %{?_smp_mflags}
 
 %install
@@ -60,6 +66,14 @@ install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr  1 2019 Prarit Bhargava <prarit@redhat.com> - 3:160-2
+- Fix version string [1692974]
+* Fri Mar 29 2019 Prarit Bhargava <prarit@redhat.com> - 3:160-1
+- Deduce channel number for Haswell/Broadwell/Skylake systems [1641046]
+- Add decoding for Optane DC persistent memory mode [1645344]
+* Mon Sep 24 2018 Prarit Bhargava <prarit@redhat.com> - 3:159-2
+- fix annocheck gcc failures [1624140]
+
 * Thu Aug 02 2018 Prarit Bhargava <prarit@redhat.com> - 3:159-1
 - update to v159