Disable failing ExtensionRegistryFactoryTest to fix FTBFS

The test started failing with the switch to JDK 11. This commit
backports an upstream patch to disable the failing test.

https://bugzilla.redhat.com/show_bug.cgi?id=1881341

.gitignore

@@ -17,3 +17,4 @@ protobuf-2.3.0.tar.bz2
 /5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.zip
 /protobuf-3.11.4-all.tar.gz
 /protobuf-3.12.3-all.tar.gz
+/protobuf-3.12.4-all.tar.gz

0001-Temporarily-disabled-ExtensionRegistryFactoryTest.patch

@@ -0,0 +1,42 @@
+From 6b3a834f33530c87da3a926488f50ab22132ddee Mon Sep 17 00:00:00 2001
+From: Adam Cozzette <acozzette@google.com>
+Date: Thu, 16 Jul 2020 11:47:36 -0700
+Subject: [PATCH] Temporarily disabled ExtensionRegistryFactoryTest
+
+This test has started failing, and I believe the cause is a change in
+class loading behavior in Java 11. As far as I know, that breaks the
+test logic but there is nothing wrong with the non-test code. This
+change temporarily disables the test so that we can unblock the 4.0
+release while I work on a more permanent fix.
+---
+ .../com/google/protobuf/ExtensionRegistryFactoryTest.java   | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java b/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java
+index c6aed074f..921a7474c 100644
+--- a/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java
++++ b/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java
+@@ -30,6 +30,7 @@
+ 
+ package com.google.protobuf;
+ 
++import org.junit.Ignore;
+ import protobuf_unittest.NonNestedExtension;
+ import protobuf_unittest.NonNestedExtensionLite;
+ import java.lang.reflect.Method;
+@@ -52,7 +53,12 @@ import junit.framework.TestSuite;
+  *
+  * <p>The test mechanism employed here is based on the pattern in {@code
+  * com.google.common.util.concurrent.AbstractFutureFallbackAtomicHelperTest}
++ *
++ * <p> This test is temporarily disabled due to what appears to be a subtle change to class loading
++ * behavior in Java 11. That seems to have broken the way the test uses a custom ClassLoader to
++ * exercise Lite functionality.
+  */
++@Ignore
+ public class ExtensionRegistryFactoryTest extends TestCase {
+ 
+   // A classloader which blacklists some non-Lite classes.
+-- 
+2.28.0
+

protobuf.spec

@@ -7,8 +7,8 @@
 
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
-Version:        3.12.3
-Release:        4%{?dist}
+Version:        3.12.4
+Release:        1%{?dist}
 License:        BSD
 URL:            https://github.com/protocolbuffers/protobuf
 Source:         https://github.com/protocolbuffers/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}-all.tar.gz
@@ -17,6 +17,9 @@ Source2:        protobuf-init.el
 # For tests (using exactly the same version as the release)
 Source3:        https://github.com/google/googletest/archive/5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.zip
 
+# Backported from upstream
+Patch0:         0001-Temporarily-disabled-ExtensionRegistryFactoryTest.patch
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  emacs
@@ -366,6 +369,10 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
 
 
 %changelog
+* Fri Oct 02 2020 Kalev Lember <klember@redhat.com> - 3.12.4-1
+- Update to 3.12.4
+- Disable failing ExtensionRegistryFactoryTest to fix FTBFS (#1881341)
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.3-4
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

sources

@@ -1,2 +1,2 @@
 SHA512 (5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.zip) = ba904f3a0b606357873db938986b0abf37425a65501340fe81f73f9c5d05f542429662fe71c0b10e4796cb6335ae9a687fc9fb21084f2f5bfd2ede79977f5821
-SHA512 (protobuf-3.12.3-all.tar.gz) = 1d17a9d728443b42104b1b2bc473825efa49e0838ac5a29085cbf3da641ebae2f9a46f83de916dfccdf30eb075489759b53c48295a3632748e66debe58788997
+SHA512 (protobuf-3.12.4-all.tar.gz) = c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c