add missed changelog entry for s390x testsuite

0001-Deactivate-markdown-doc.patch

@@ -0,0 +1,25 @@
+diff -Naur a/llvm/docs/conf.py b/llvm/docs/conf.py
+--- a/llvm/docs/conf.py	2020-09-15 09:12:24.318287611 +0000
++++ b/llvm/docs/conf.py	2020-09-15 15:01:00.025893199 +0000
+@@ -36,20 +36,7 @@
+     '.rst': 'restructuredtext',
+ }
+ 
+-try:
+-  import recommonmark
+-except ImportError:
+-  # manpages do not use any .md sources
+-  if not tags.has('builder-man'):
+-    raise
+-else:
+-  import sphinx
+-  if sphinx.version_info >= (3, 0):
+-    # This requires 0.5 or later.
+-    extensions.append('recommonmark')
+-  else:
+-    source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
+-  source_suffix['.md'] = 'markdown'
++import sphinx
+ 
+ # The encoding of source files.
+ #source_encoding = 'utf-8-sig'

gcc12.patch

@@ -1,20 +0,0 @@
---- a/llvm-11.1.0.src/include/llvm/Support/Base64.h	2021-02-03 14:51:10.000000000 -0700
-+++ b/llvm-11.1.0.src/include/llvm/Support/Base64.h	2023-01-30 10:58:39.424270016 -0700
-@@ -13,6 +13,7 @@
- #ifndef LLVM_SUPPORT_BASE64_H
- #define LLVM_SUPPORT_BASE64_H
- 
-+#include <cstdint>
- #include <string>
- 
- namespace llvm {
---- a/llvm-11.1.0.src/include/llvm/Support/Signals.h	2021-02-03 14:51:10.000000000 -0700
-+++ b/llvm-11.1.0.src/include/llvm/Support/Signals.h	2023-01-30 09:51:35.823901524 -0700
-@@ -14,6 +14,7 @@
- #ifndef LLVM_SUPPORT_SIGNALS_H
- #define LLVM_SUPPORT_SIGNALS_H
- 
-+#include <cstdint>
- #include <string>
- 
- namespace llvm {

llvm11.spec

@@ -11,7 +11,7 @@
 %global llvm_libdir %{_libdir}/%{name}
 %global build_llvm_libdir %{buildroot}%{llvm_libdir}
 #global rc_ver 2
-%global baserelease 16
+%global baserelease 6
 %global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src
 %global maj_ver 11
 %global min_ver 1
@@ -60,12 +60,12 @@ Source4:	lit.fedora.cfg.py
 
 # Fix coreos-installer test crash on s390x (rhbz#1883457), https://reviews.llvm.org/D89034
 Patch1:		0001-SystemZ-Use-LA-instead-of-AGR-in-eliminateFrameIndex.patch
-Patch2:		0001-gcc11.patch
+Patch2:     0001-gcc11.patch
 Patch3:		0001-SystemZ-Assign-the-full-space-for-promoted-and-split.patch
 Patch4:		0001-MemCpyOpt-Correctly-merge-alias-scopes-during-call-s.patch
-Patch5:		gcc12.patch
-Patch6:		typename.patch
-Patch7:		test-go-py-pipes.patch
+
+# RHEL-specific patches
+Patch101:	0001-Deactivate-markdown-doc.patch
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
@@ -75,7 +75,9 @@ BuildRequires:	zlib-devel
 BuildRequires:	libffi-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	python3-sphinx
+%if !0%{?rhel}
 BuildRequires:	python3-recommonmark
+%endif
 BuildRequires:	multilib-rpm-config
 %if %{with gold}
 BuildRequires:	binutils-devel
@@ -187,7 +189,13 @@ LLVM's modified googletest sources.
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -n %{llvm_srcdir} -p2
 
-%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -i %{__python3} -pn \
+%ifarch s390x
+# 2 tests failing:
+mv test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test{,.DISABLED}
+mv test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test{,.DISABLED}
+%endif
+
+pathfix.py -i %{__python3} -pn \
 	test/BugPoint/compile-custom.ll.py \
 	tools/opt-viewer/*.py \
 	utils/update_cc_test_checks.py
@@ -562,42 +570,9 @@ fi
 %endif
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jan 30 2023 Jerry James <loganjerry@gmail.com> - 11.1.0-10
-- Add gcc12 patch to add includes needed for GCC 12
-- Add typename patch to fix test failures
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 11.1.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Sun Feb  6 2022 Jens Petersen <petersen@redhat.com> - 11.1.0-6
+- Remove dependency on python3-recommonmark (like RHEL9 llvm)
+- s390x: disable 2 llvm-objcopy/ELF/compress-debug-sections-zlib tests
 
 * Wed May 19 2021 sguelton@redhat.com - 11.1.0-5
 - Fix handling of llvm-config

test-go-py-pipes.patch

@@ -1,18 +0,0 @@
---- a/llvm-13.0.1.src/test/Bindings/Go/lit.local.cfg	2022-01-21 05:31:59.000000000 +0800
-+++ b/llvm-13.0.1.src/test/Bindings/Go/lit.local.cfg	2024-07-19 21:33:42.775023065 +0800
-@@ -1,5 +1,4 @@
- import os
--import pipes
- import shlex
- import sys
- 
-@@ -56,7 +55,7 @@
-     except (AttributeError, OSError):
-         pass
- 
--    return ' '.join([pipes.quote(arg) for arg in args])
-+    return ' '.join([shlex.quote(arg) for arg in args])
- 
- config.environment['CC'] = fixup_compiler_path(config.host_cc)
- config.environment['CXX'] = fixup_compiler_path(config.host_cxx)
-