From a285e1b4f0fed8b9c76101b6f8343c6574d713dc Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Thu, 21 Apr 2022 15:17:27 -0700
Subject: [PATCH] Update to 0.4.1

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
---
 .gitignore                             |  2 +-
 libkdumpfile-0.4.1-fix-for-gcc12.patch | 11 ++++++
 libkdumpfile.spec                      | 46 ++++++++++++++++----------
 sources                                |  2 +-
 4 files changed, 41 insertions(+), 20 deletions(-)
 create mode 100644 libkdumpfile-0.4.1-fix-for-gcc12.patch

diff --git a/.gitignore b/.gitignore
index 7cb2665..dc01141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libkdumpfile-0.4.0.tar.gz
+/libkdumpfile-0.4.1.tar.gz
diff --git a/libkdumpfile-0.4.1-fix-for-gcc12.patch b/libkdumpfile-0.4.1-fix-for-gcc12.patch
new file mode 100644
index 0000000..b4efc4f
--- /dev/null
+++ b/libkdumpfile-0.4.1-fix-for-gcc12.patch
@@ -0,0 +1,11 @@
+diff '--color=auto' -ruN libkdumpfile-0.4.1/src/kdumpfile/devmem.c libkdumpfile-0.4.1-fix-for-gcc12/src/kdumpfile/devmem.c
+--- libkdumpfile-0.4.1/src/kdumpfile/devmem.c	2020-02-13 06:48:02.000000000 -0800
++++ libkdumpfile-0.4.1-fix-for-gcc12/src/kdumpfile/devmem.c	2022-04-21 16:54:42.830664327 -0700
+@@ -84,6 +84,7 @@
+ 	}
+ }
+ 
++__attribute__((__noipa__))
+ static int
+ xen_cpuid(uint32_t leaf, uint32_t subleaf,
+ 	  uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
diff --git a/libkdumpfile.spec b/libkdumpfile.spec
index a31fe78..4d69fde 100644
--- a/libkdumpfile.spec
+++ b/libkdumpfile.spec
@@ -1,14 +1,15 @@
-%global mainlibsover 8
-%global addrlibsover 1
+%global mainlibsover 9
+%global addrlibsover 2
 
 Name:           libkdumpfile
-Version:        0.4.0
+Version:        0.4.1
 Release:        %autorelease
 Summary:        Kernel coredump file access
 
 License:        LGPLv3+ or GPLv2+
 URL:            https://github.com/ptesarik/libkdumpfile
-Source0:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source:         %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Patch:          %{name}-0.4.1-fix-for-gcc12.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  doxygen
@@ -19,45 +20,52 @@ BuildRequires:  python3-devel
 BuildRequires:  snappy-devel
 BuildRequires:  zlib-devel
 
-%description
-libkdumpfile is a library to read kdump-compressed kernel core dumps.
+%global _description %{expand:
+libkdumpfile is a library to read kdump-compressed kernel core dumps.}
+
+%description %{_description}
 
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description    devel
+%description    devel %{_description}
+
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %package        doc
 Summary:        Documentation for %{name}
 
-%description    doc
+%description    doc %{_description}
+
 The %{name}-doc package contains documentation for %{name}.
 
 %package -n python3-%{name}
 Summary:        Python bindings for %{name}
-Obsoletes:      %{name}-python < %{version}-%{release}
+Obsoletes:      %{name}-python < 0.4.0-6
 Provides:       %{name}-python = %{version}-%{release}
 Provides:       %{name}-python%{?_isa} = %{version}-%{release}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description -n python3-%{name}
+%description -n python3-%{name} %{_description}
+
 The python3-%{name} package contains Python bindings for %{name}.
 
 %package        util
 Summary:        Utilities to read kernel core dumps
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description    util
+%description    util %{_description}
 The %{name}-devel package contains misc utilities built with %{name}.
 
+
 %prep
-%autosetup
+%autosetup -p1
 # Remove unneeded shebang
 sed -e "\|#!/usr/bin/env python|d" -i python/*/*.py
 
+
 %build
 %configure --disable-static
 %make_build
@@ -68,11 +76,12 @@ sed -e "\|#!/usr/bin/env python|d" -i python/*/*.py
 %make_install
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+
 %files
 %license COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
 %doc README.md NEWS
-%{_libdir}/libaddrxlat.so.%{mainlibsover}{,.*}
-%{_libdir}/libkdumpfile.so.%{addrlibsover}{,.*}
+%{_libdir}/libaddrxlat.so.%{addrlibsover}{,.*}
+%{_libdir}/libkdumpfile.so.%{mainlibsover}{,.*}
 
 %files devel
 %{_includedir}/%{name}/
@@ -86,10 +95,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %doc doc/html
 
 %files -n python3-%{name}
-%{python3_sitelib}/addrxlat
-%{python3_sitearch}/_addrxlat.so*
-%{python3_sitelib}/kdumpfile
-%{python3_sitearch}/_kdumpfile.so*
+%{python3_sitearch}/%{name}-%{version}-*.egg-info
+%{python3_sitearch}/addrxlat/
+%{python3_sitearch}/_addrxlat.*.so
+%{python3_sitearch}/kdumpfile/
+%{python3_sitearch}/_kdumpfile.*.so
 
 %files util
 %{_bindir}/dumpattr
diff --git a/sources b/sources
index de00c2c..5373bd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libkdumpfile-0.4.0.tar.gz) = caea77b6dcad12adbcca3eee1021c0152966ef1fdf20a15f6df6fe0da782addc1ef5771dca0fd0baf847ec296bcc2dce474a54d68c08ea6d873fc29ba9d69f82
+SHA512 (libkdumpfile-0.4.1.tar.gz) = 48aaa53d3c977b02e155a0586eb6e3eb66e7c885bdb1beeeeabbdae47fe1770fb48eb7b923945d8b3cb0949676b27f4a9f1f434cf1f837b4af50210294816e96