SOURCES/0002-fix-__atomic_thread_fence-on-s390x.patch

@@ -1,12 +0,0 @@
-diff -Naur protobuf-3.5.0/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h protobuf-3.5.0_patched/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h
---- protobuf-3.5.0/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h	2017-11-13 19:47:29.000000000 +0100
-+++ protobuf-3.5.0_patched/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h	2025-07-30 14:15:59.956298045 +0200
-@@ -56,7 +56,7 @@
- #if defined(__GLIBCXX__)
-   // Work around libstdc++ bug 51038 where atomic_thread_fence was declared but
-   // not defined, leading to the linker complaining about undefined references.
--  __atomic_thread_fence(std::memory_order_seq_cst);
-+  __atomic_thread_fence(__ATOMIC_SEQ_CST);
- #else
-   std::atomic_thread_fence(std::memory_order_seq_cst);
- #endif

SPECS/protobuf.spec

@@ -14,7 +14,7 @@
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        3.5.0
-Release:        17%{?dist}
+Release:        15%{?dist}
 License:        BSD
 URL:            https://github.com/google/protobuf
 Source:         https://github.com/google/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}.tar.gz
@@ -26,7 +26,6 @@ Source4:        https://github.com/google/googletest/archive/release-1.7.0.tar.g
 # Might be upstreamable, but for now temporary workaround
 Patch0:         0001-fix-build-on-s390x.patch
 Patch1:         CVE-2021-22570.rhel-8.patch
-Patch2:         0002-fix-__atomic_thread_fence-on-s390x.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -423,12 +422,6 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
 %endif
 
 %changelog
-* Thu Jul 31 2025 Pavol Sloboda <psloboda@redhat.com> - 3.5.0-17
-- Rebuild
-
-* Wed Jul 30 2025 Adrian Reber <areber@redhat.com> - 3.5.0-16
-- Rebuild for changes to test setup
-
 * Mon Mar 21 2022 Adrian Reber <areber@redhat.com> - 3.5.0-15
 - Applied patch for for CVE-2021-22570 (#2050494)