From 8b3b02e83af8326562a155581d77f04f2ae84197 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel@michel-slm.name>
Date: Sat, 6 Aug 2022 16:26:08 -0500
Subject: [PATCH] Include diskdump endianness fix

Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>
---
 .gitignore                        |  3 ++-
 libkdumpfile.spec                 |  9 ++-------
 s390x-disable-diskdump-split.diff | 18 ------------------
 series                            |  1 -
 sources                           |  2 +-
 5 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 s390x-disable-diskdump-split.diff

diff --git a/.gitignore b/.gitignore
index cdbcbbb..b206ca4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/libkdumpfile-*.tar.gz
+/libkdumpfile-*.*.*.tar.gz
+/libkdumpfile-???????.tar.gz
diff --git a/libkdumpfile.spec b/libkdumpfile.spec
index ee6c9fd..4bbff61 100644
--- a/libkdumpfile.spec
+++ b/libkdumpfile.spec
@@ -2,9 +2,9 @@
 %global addrlibsover 3
 
 %global upstream_ver 0.4.1
-%global commit 4829feb8a46e76ac2f2bc98f47b2f3f1d32300df
+%global commit 9184e5c9519ea10efc74d2c4c27a62bd4fbf50fa
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20220714
+%global date 20220806
 
 Name:           libkdumpfile
 Version:        %{upstream_ver}^%{date}%{shortcommit}
@@ -15,8 +15,6 @@ License:        LGPLv3+ or GPLv2+
 URL:            https://github.com/ptesarik/libkdumpfile
 # Source:         %%{url}/releases/download/v%%{version}/%%{name}-%%{version}.tar.gz
 Source0:         %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
-# https://github.com/ptesarik/libkdumpfile/issues/44
-Source1:          s390x-disable-diskdump-split.diff
 # https://github.com/ptesarik/libkdumpfile/pull/45
 Patch:          fix-python-311-tests.diff
 
@@ -78,9 +76,6 @@ The %{name}-devel package contains misc utilities built with %{name}.
 %autosetup -p1 -n %{name}-%{commit}
 # Remove unneeded shebang
 sed -e "\|#!/usr/bin/env python|d" -i python/*/*.py
-%ifarch s390x
-cat %{SOURCE1} | patch -p1
-%endif
 # non-release builds
 autoreconf -fiv
 
diff --git a/s390x-disable-diskdump-split.diff b/s390x-disable-diskdump-split.diff
deleted file mode 100644
index af50dbe..0000000
--- a/s390x-disable-diskdump-split.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: disable diskdump-split test
- This should be applied on s390x only, where this test is failing
-Author: Michel Alexandre Salim <salimma@fedoraproject.org>
-Origin: other
-Bug: https://github.com/ptesarik/libkdumpfile/issues/44
-Last-Update: 2022-08-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -184,7 +184,6 @@ test_scripts = \
- 	diskdump-basic-zstd \
- 	diskdump-multiread \
- 	diskdump-excluded \
--	diskdump-split \
- 	early-version-code \
- 	elf-empty-aarch64 \
- 	elf-empty-i386 \
diff --git a/series b/series
index 3cb9f6b..9e42dd5 100644
--- a/series
+++ b/series
@@ -1,2 +1 @@
 fix-python-311-tests.diff
-s390x-disable-diskdump-split.diff
diff --git a/sources b/sources
index b0699f9..ed8620d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libkdumpfile-4829feb.tar.gz) = 43c7433ac8cabef6d620ee1bd53958527cabb88af9508ae8a14cddcbeb723752babcaefb99a6c1abb753a8138e34df930cb445392907b9b02474a0c11a578d69
+SHA512 (libkdumpfile-9184e5c.tar.gz) = 2d04270a0c15e2395a5f8c82c7c5681a79b687b64c9904ed4c73fd1acd0d8f31efaa14e5e383be40c1e4f1dd190eaad72ba16da4d75b645546796184d38e56dd