From 325a3471cc6785d93455685c1b85b156acd0066d Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Wed, 13 Dec 2023 15:33:02 +0200
Subject: [PATCH] Properly check valgrind arches

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
---
 hyphen-dumplog.patch | 17 -----------------
 hyphen.spec          | 13 ++++++-------
 2 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 hyphen-dumplog.patch

diff --git a/hyphen-dumplog.patch b/hyphen-dumplog.patch
deleted file mode 100644
index 4235b91..0000000
--- a/hyphen-dumplog.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- tests/test.sh	2012-04-12 15:29:53.576994298 +0100
-+++ tests/test.sh	2012-04-12 15:30:06.447143498 +0100
-@@ -7,12 +7,14 @@
-     if ! grep -q 'ERROR SUMMARY: 0 error' $log; then
-         echo "Fail in $NAME $1 checking detected by Valgrind"
-         echo "$log Valgrind log file moved to $TEMPDIR/badlogs"
-+	cat $log
-         mv $log $TEMPDIR/badlogs
-         exit 1
-     fi
-     if grep -q 'LEAK SUMMARY' $log; then
-         echo "Memory leak in $NAME $1 checking detected by Valgrind"
-         echo "$log Valgrind log file moved to $TEMPDIR/badlogs"
-+	cat $log
-         mv $log $TEMPDIR/badlogs
-         exit 1
-     fi    
diff --git a/hyphen.spec b/hyphen.spec
index 82ab040..02303c3 100644
--- a/hyphen.spec
+++ b/hyphen.spec
@@ -1,16 +1,12 @@
 Name:      hyphen
 Summary:   A text hyphenation library
 Version:   2.8.8
-Release:   23%{?dist}
+Release:   24%{?dist}
 Source:    http://downloads.sourceforge.net/hunspell/hyphen-%{version}.tar.gz
 URL:       http://hunspell.sf.net
 License:   GPL-2.0-only OR LGPL-2.1-or-later OR MPL-1.1
 BuildRequires: perl-interpreter, patch, autoconf, automake, libtool
-# s390 lacks valgrind support
-# no working valgrind built for MIPS yet
-# tests with valgrind fail on arm
-# tests with valgrind fail on ppc64le
-%ifnarch s390 %{arm} %{mips} ppc64le
+%ifarch %{valgrind_arches}
 BuildRequires: valgrind
 %endif
 BuildRequires: make
@@ -42,7 +38,7 @@ make %{?_smp_mflags}
 
 %check
 make check
-%ifnarch s390 %{arm} %{mips} ppc64le
+%ifarch %{valgrind_arches}
 VALGRIND=memcheck make check
 %endif
 
@@ -75,6 +71,9 @@ popd
 %{_bindir}/substrings.pl
 
 %changelog
+* Wed Mar 06 2024 David Abdurachmanov <davidlt@rivosinc.com> - 2.8.8-24
+- Properly check valgrind arches
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.8-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild