rebuild with separate debuginfo build-ids

[packages/protobuf.git] / protobuf.spec

diff --git a/protobuf.spec b/protobuf.spec
index 49308b8a95fe81eac3942cffde81e2d289bd5514..3e51bc277dc4bdeb4d6f201cd5edfacf69710a40 100644 (file)
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -7,31 +7,34 @@
 %bcond_without python2 # Python 2.x bindings
 %bcond_without python3 # Python 3.x bindings
 %bcond_without ruby    # Ruby bindings
-%bcond_without tests   # perform "make check"
+%bcond_without tests   # perform "make check" (requires 4+GB RAM on 64-bit archs)
 
 Summary:       Protocol Buffers - Google's data interchange format
 Summary(pl.UTF-8):     Protocol Buffers - format wymiany danych Google
 Name:          protobuf
-Version:       3.9.0
-Release:       2
+Version:       3.14.0
+Release:       3
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/google/protobuf/releases
 Source0:       https://github.com/google/protobuf/releases/download/v%{version}/%{name}-all-%{version}.tar.gz
-# Source0-md5: a44c3bbee380181c86f573b835294782
+# Source0-md5: d0a7dd930210af5285c08c8a2c2304ab
 Source1:       ftdetect-proto.vim
 Patch0:                system-gtest.patch
 Patch1:                no-wrap-memcpy.patch
+Patch2:                %{name}-x32.patch
+Patch3:                %{name}-disable-64bitptr-test.patch
 URL:           https://github.com/google/protobuf/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
-#%{?with_tests:BuildRequires:  gmock-devel >= 1.9.0}
-#%{?with_tests:BuildRequires:  gtest-devel >= 1.9.0}
+%{?with_tests:BuildRequires:   gmock-devel >= 1.9.0}
+%{?with_tests:BuildRequires:   gtest-devel >= 1.9.0}
 BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: libtool
 BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
 %if %{with python2}
-BuildRequires: python-modules >= 1:2.6
+BuildRequires: python-modules >= 1:2.7
 BuildRequires: python-setuptools
 %endif
 %if %{with python3}
@@ -47,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)
@@ -154,8 +158,9 @@ Statyczne biblioteki buforów protokołowych (Protocol Buffers).
 Summary:       Python 2 bindings for Protocol Buffers
 Summary(pl.UTF-8):     Wiązania Pythona 2 do buforów protokołowych (Protocol Buffers)
 Group:         Development/Languages/Python
-Requires:      python-modules >= 1:2.6
+Requires:      python-modules >= 1:2.7
 # does not use C++ library at this time
+BuildArch:     noarch
 
 %description -n python-protobuf
 Python 2 bindings for Protocol Buffers.
@@ -169,6 +174,7 @@ Summary(pl.UTF-8):  Wiązania Pythona 3 do buforów protokołowych (Protocol Buff
 Group:         Development/Languages/Python
 Requires:      python3-modules >= 1:3.3
 # does not use C++ library at this time
+BuildArch:     noarch
 
 %description -n python3-protobuf
 Python 3 bindings for Protocol Buffers.
@@ -204,14 +210,25 @@ opisów buforów protokołowych (Protocol Buffers).
 
 %prep
 %setup -q
-# protobuf needs gtest 1.9.0 (not released yet), use bundled version
-#patch0 -p1
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%ifnarch %{x8664} aarch64 alpha ia64 mips64 ppc64 s390x sparc64
+%patch3 -p1
+%endif
 
-#ln -s /usr/src/gmock/src/gmock*.cc src
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' \
+      examples/add_person.py \
+      examples/list_people.py
 
-# remove for gtest >= 1.9
-#%{__sed} -i -e 's/INSTANTIATE_TEST_SUITE_P/INSTANTIATE_TEST_CASE_P/' src/google/protobuf/{compiler/command_line_interface_unittest.cc,descriptor_unittest.cc,dynamic_message_unittest.cc,map_field_test.cc,util/internal/default_value_objectwriter_test.cc,util/internal/protostream_objectsource_test.cc,util/internal/protostream_objectwriter_test.cc}
+# 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}
@@ -296,17 +313,17 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES.txt CONTRIBUTORS.txt LICENSE README.md
 %attr(755,root,root) %{_bindir}/protoc
 %attr(755,root,root) %{_libdir}/libprotoc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotoc.so.20
+%attr(755,root,root) %ghost %{_libdir}/libprotoc.so.25
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libprotobuf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.20
+%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.25
 
 %files lite
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libprotobuf-lite.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.20
+%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.25
 
 %files devel
 %defattr(644,root,root,755)