From acbf41dda9d6007bdc1ff0fcd87e966f3d458407a8d4ed954832a10dd951c8ef Mon Sep 17 00:00:00 2001
From: Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
Date: Mon, 4 Oct 2021 09:37:46 +0000
Subject: [PATCH] Accepting request 922855 from
 home:cboltz:branches:openSUSE:Factory:zSystems

- drop sysstat-disable-test-failures.patch - tests are fine on s390x
  and ppc64, no need to ignore test failures anymore

OBS-URL: https://build.opensuse.org/request/show/922855
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysstat?expand=0&rev=129
---
 sysstat-disable-test-failures.patch | 13 -------------
 sysstat.changes                     |  6 ++++++
 sysstat.spec                        |  5 -----
 3 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 sysstat-disable-test-failures.patch

diff --git a/sysstat-disable-test-failures.patch b/sysstat-disable-test-failures.patch
deleted file mode 100644
index 8d4e0c5..0000000
--- a/sysstat-disable-test-failures.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sysstat-12.2.0/Makefile.in
-===================================================================
---- sysstat-12.2.0.orig/Makefile.in
-+++ sysstat-12.2.0/Makefile.in
-@@ -638,7 +638,7 @@ testcomp: tests/ini/inisar
- 
- unit:
- 	@echo $(X) 2>&1
--	@cat $(TESTDIR)/$(X) | $(TESTRUN)
-+	@cat $(TESTDIR)/$(X) | $(TESTRUN) || { echo "Skip build failure in s390x and ppc64" ; }
- 
- # Use "do_test" script to make the following target
- simtest: all testcomp
diff --git a/sysstat.changes b/sysstat.changes
index 925c411..6a88235 100644
--- a/sysstat.changes
+++ b/sysstat.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Oct  3 15:11:09 UTC 2021 - Christian Boltz <suse-beta@cboltz.de>
+
+- drop sysstat-disable-test-failures.patch - tests are fine on s390x
+  and ppc64, no need to ignore test failures anymore
+
 -------------------------------------------------------------------
 Fri Jun  4 07:18:37 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/sysstat.spec b/sysstat.spec
index 90b3d1e..725f109 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -33,8 +33,6 @@ Patch0:         sysstat-8.1.6-sa1sa2lock.diff
 Patch2:         sysstat-8.0.4-pagesize.diff
 # PATCH-FIX-OPENSUSE bsc#1151453
 Patch3:         sysstat-service.patch
-# PATCH-FIX-OPENSUSE Temporarily disable failing tests on s390x and ppc64
-Patch4:         sysstat-disable-test-failures.patch
 BuildRequires:  findutils
 BuildRequires:  gettext-runtime
 BuildRequires:  pkgconfig
@@ -74,9 +72,6 @@ from a sysstat package.
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
-%ifarch s390x ppc64
-%patch4 -p1
-%endif
 cp %{SOURCE1} .
 # remove date and time from objects
 find ./ -name \*.c -exec sed -i -e 's: " compiled " __DATE__ " " __TIME__::g' {} \;