From 9c3fb46e674e0ff1105e0658ceb840f8336bec05 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Fri, 17 Nov 2023 15:04:55 +0100
Subject: [PATCH] 3.22.0-2 - Drop support for rhel6

---
 valgrind.spec | 47 +++++------------------------------------------
 1 file changed, 5 insertions(+), 42 deletions(-)

diff --git a/valgrind.spec b/valgrind.spec
index c658948..abef8fd 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -14,7 +14,7 @@ URL: https://www.valgrind.org/
 
 # We never want the openmpi subpackage when building a software collecton.
 # We always want it for fedora.
-# We only want it for older rhel. But not s390x for too old rhel.
+# We only want it for older rhel.
 # And on fedora > 39 i386 dropped openmpi.
 %if %{is_scl}
   %global build_openmpi 0
@@ -30,11 +30,7 @@ URL: https://www.valgrind.org/
     %if 0%{?rhel} > 7
       %global build_openmpi 0
     %else
-      %ifarch s390x
-	%global build_openmpi (%{?rhel} > 6)
-      %else
-	%global build_openmpi 1
-      %endif
+      %global build_openmpi 1
     %endif
   %endif
 %endif
@@ -54,17 +50,11 @@ URL: https://www.valgrind.org/
 # Whether to run the full regtest or only a limited set
 # The full regtest includes gdb_server integration tests
 # and experimental tools.
-# Only run full regtests on fedora, but not on older rhel
-# or when creating scl, the gdb_server tests might hang.
+# Don't run them when creating scl, the gdb_server tests might hang.
 %if %{is_scl}
   %global run_full_regtest 0
 %else
-  %if 0%{?fedora}
-    %global run_full_regtest 1
-  %endif
-  %if 0%{?rhel}
-    %global run_full_regtest (%rhel >= 7)
-  %endif
+  %global run_full_regtest 1
 %endif
 
 # Generating minisymtabs doesn't really work for the staticly linked
@@ -132,13 +122,6 @@ Recommends: elfutils-debuginfod-client
 
 %{?scl:Requires:%scl_runtime}
 
-# We need to fixup selinux file context when doing a scl build.
-# In RHEL6 we might need to fix up the labels even though the
-# meta package sets up a fs equivalence. See post.
-%if 0%{?rhel} == 6
-%{?scl:Requires(post): /sbin/restorecon}
-%endif
-
 # We could use %%valgrind_arches as defined in redhat-rpm-config
 # But that is really for programs using valgrind, it defines the
 # set of architectures that valgrind works correctly on.
@@ -223,12 +206,8 @@ Valgrind User Manual for details.
 
 %patch -P1 -p1
 %patch -P2 -p1
-
-# Old rhel gcc doesn't have -fstack-protector-strong.
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %patch -P3 -p1
 %patch -P4 -p1
-%endif
 
 %patch -P5 -p1
 
@@ -242,14 +221,9 @@ Valgrind User Manual for details.
 # Just always autoreconf so we don't need patches to prebuild files.
 ./autogen.sh
 
-# Old openmpi-devel has version depended paths for mpicc.
 %if %{build_openmpi}
-%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6
 %define mpiccpath %{!?scl:%{_libdir}}%{?scl:%{_root_libdir}}/openmpi/bin/mpicc
 %else
-%define mpiccpath %{!?scl:%{_libdir}}%{?scl:%{_root_libdir}}/openmpi/*/bin/mpicc
-%endif
-%else
 # We explicitly don't want the libmpi wrapper. So make sure that configure
 # doesn't pick some random mpi compiler that happens to be installed.
 %define mpiccpath /bin/false
@@ -451,21 +425,10 @@ echo ===============END TESTING===============
 %{_libdir}/valgrind/libmpiwrap*.so
 %endif
 
-%if 0%{?rhel} == 6
-%post
-# There is a bug in rpm (rhbz#214737) that might cause post to be run
-# even thought the binary isn't installed when installing two multilib
-# versions at the same time.
-if [ -x %{_bindir}/valgrind ]; then
-# On RHEL6 the fs equivalency should be setup by the devtoolset meta
-# package, but because of a rpm bug (rhbz#924044) it might not work.
-%{?scl:/sbin/restorecon %{_bindir}/valgrind}%{!?scl:true}
-fi
-%endif
-
 %changelog
 * Fri Nov 17 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-2
 - Add valgrind-3.22.0-valgrind-monitor-python-re.patch
+- Drop support for rhel6
 
 * Tue Oct 31 2023 Mark Wielaard <mjw@fedoraproject.org> - 3.22.0-1
 - Upstream 3.22.0 final