- added x32 patch (disable test specific to LP64 archs)

[packages/protobuf.git] / protobuf.spec

diff --git a/protobuf.spec b/protobuf.spec
index 35b4ef5f9e65f7166152b5180a04fa56b479c8a4..3d209b54dde7e45b93554a13bb35626ead07ae2e 100644 (file)
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -13,7 +13,7 @@ Summary:      Protocol Buffers - Google's data interchange format
 Summary(pl.UTF-8):     Protocol Buffers - format wymiany danych Google
 Name:          protobuf
 Version:       3.13.0
-Release:       2
+Release:       3
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/google/protobuf/releases
@@ -23,6 +23,7 @@ Source1:      ftdetect-proto.vim
 Patch0:                system-gtest.patch
 Patch1:                no-wrap-memcpy.patch
 Patch2:                %{name}-no-wheel.patch
+Patch3:                %{name}-x32.patch
 URL:           https://github.com/google/protobuf/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
@@ -31,6 +32,7 @@ BuildRequires:        automake >= 1:1.9
 BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: libtool
 BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
 %if %{with python2}
 BuildRequires: python-modules >= 1:2.7
 BuildRequires: python-setuptools
@@ -48,6 +50,7 @@ BuildRequires:        ruby-devel
 BuildRequires: ruby-rake
 BuildRequires: ruby-rake-compiler
 %endif
+BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel >= 1.2.0.4
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -208,11 +211,21 @@ opisów buforów protokołowych (Protocol Buffers).
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' \
       examples/add_person.py \
       examples/list_people.py
 
+# gcc 10.2 false positive warning (with tag values >= 128):
+#
+#  if (tag < 128) {
+#    return *ptr == tag;
+#           ~~~~~^~~~~~ error: comparison is always false due to limited range of data type [-Werror=type-limits]
+#  } else {
+#
+%{__sed} -i -e 's/-Werror //' src/Makefile.am
+
 %build
 %{__libtoolize}
 %{__aclocal} -I m4