From fdc7a9390dd26edabc74257e4d85fedccf8350b2 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Feb 28 2019 14:58:58 +0000
Subject: Update googletest to 1.8.1 to re-enable tests


---

diff --git a/.gitignore b/.gitignore
index de34522..b65267c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ protobuf-2.3.0.tar.bz2
 /protobuf-3.4.1.tar.gz
 /protobuf-3.5.0.tar.gz
 /protobuf-3.6.1-all.tar.gz
+/googletest-1.8.1.tar.gz
diff --git a/protobuf.spec b/protobuf.spec
index 58fbb69..d1e2f6c 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -12,15 +12,14 @@
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        3.6.1
-Release:        2%{?dist}
+Release:        3%{?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
 Source1:        ftdetect-proto.vim
 Source2:        protobuf-init.el
 # For tests
-Source3:        https://github.com/google/googlemock/archive/release-1.7.0.tar.gz#/googlemock-1.7.0.tar.gz
-Source4:        https://github.com/google/googletest/archive/release-1.7.0.tar.gz#/googletest-1.7.0.tar.gz
+Source3:        https://github.com/google/googletest/archive/release-1.8.1.tar.gz#/googletest-1.8.1.tar.gz
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -214,10 +213,9 @@ Protocol Buffer Parent POM.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}%{?rcver} -a 3 -a 4
+%setup -q -n %{name}-%{version}%{?rcver} -a 3
 %autopatch -p1
-mv googlemock-release-1.7.0 gmock
-mv googletest-release-1.7.0 gmock/gtest
+mv googletest-release-1.8.1/* third_party/googletest/
 find -name \*.cc -o -name \*.h | xargs chmod -x
 chmod 644 examples/*
 %if %{with java}
@@ -250,7 +248,7 @@ export PTHREAD_LIBS="-lpthread"
 ./autogen.sh
 %configure
 
-make %{?_smp_mflags}
+%make_build
 
 %if %{with python}
 pushd python
@@ -266,9 +264,13 @@ popd
 emacs -batch -f batch-byte-compile editors/protobuf-mode.el
 
 %check
-# TODO: failures; get them fixed and remove || :
-# https://github.com/google/protobuf/issues/631
-make %{?_smp_mflags} check || :
+# Java tests fail on s390x
+%ifarch s390x
+fail=0
+%else
+fail=1
+%endif
+make %{?_smp_mflags} check || exit $fail
 
 %install
 make %{?_smp_mflags} install DESTDIR=%{buildroot} STRIPBINARIES=no INSTALL="%{__install} -p" CPPROG="cp -p"
@@ -378,6 +380,9 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
 %endif
 
 %changelog
+* Wed Feb 27 2019 Orion Poplawski <orion@nwra.com> - 3.6.1-3
+- Update googletest to 1.8.1 to re-enable tests
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index c2af151..5714cc7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 SHA512 (protobuf-3.6.1-all.tar.gz) = 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-SHA512 (googlemock-1.7.0.tar.gz) = adf33728dde55d95e1c65c38a10b0578dd63a44e6beeb550dc976dc134f83a3af8096094ae2258f16cd5bebe2326f344db8981f11088bac3ffe04b384d9d2f2d
-SHA512 (googletest-1.7.0.tar.gz) = c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
+SHA512 (googletest-1.8.1.tar.gz) = e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7