- up to 3.11.4

diff --git a/no-wrap-memcpy.patch b/no-wrap-memcpy.patch
index e050a194d8126535bcb3bddf63f3cd553b4f3b19..2a62acb58f5323d6469844ee6ae13879d9a06aa0 100644 (file)
--- a/no-wrap-memcpy.patch
+++ b/no-wrap-memcpy.patch
@@ -1,20 +1,21 @@
---- protobuf-3.7.0/ruby/ext/google/protobuf_c/extconf.rb       2019-03-12 12:41:06.025000000 +0100
-+++ protobuf-3.7.0/ruby/ext/google/protobuf_c/extconf.rb       2019-03-12 12:42:04.062000000 +0100
-@@ -5,19 +5,12 @@
+--- protobuf-3.11.4/ruby/ext/google/protobuf_c/extconf.rb~     2020-02-14 21:13:37.000000000 +0100
++++ protobuf-3.11.4/ruby/ext/google/protobuf_c/extconf.rb      2020-04-07 22:56:24.419874091 +0200
+@@ -3,19 +3,17 @@
+ require 'mkmf'
+ 
  if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
-   # XOPEN_SOURCE needed for strptime:
-   # https://stackoverflow.com/questions/35234152/strptime-giving-implicit-declaration-and-undefined-reference
--  $CFLAGS += " -std=c99 -O3 -DNDEBUG -D_XOPEN_SOURCE=700"
-+  $CFLAGS += " -std=c99 -DNDEBUG -D_XOPEN_SOURCE=700"
+-  $CFLAGS += " -std=gnu90 -O3 -DNDEBUG -Wall -Wdeclaration-after-statement -Wsign-compare"
++  $CFLAGS += " -std=gnu90 -DNDEBUG -Wall -Wdeclaration-after-statement -Wsign-compare"
  else
--  $CFLAGS += " -std=c99 -O3 -DNDEBUG"
--end
--
--
--if RUBY_PLATFORM =~ /linux/
+-  $CFLAGS += " -std=gnu90 -O3 -DNDEBUG"
++  $CFLAGS += " -std=gnu90 -DNDEBUG"
+ end
+ 
+ 
+ if RUBY_PLATFORM =~ /linux/
 -  # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
 -  $LDFLAGS += " -Wl,-wrap,memcpy"
-+  $CFLAGS += " -std=c99 -DNDEBUG"
++  $LDFLAGS += " -std=c99 -DNDEBUG"
  end
  
  $objs = ["protobuf.o", "defs.o", "storage.o", "message.o",

diff --git a/protobuf.spec b/protobuf.spec
index dcef0ab644ee53060e2a66f8f334824e56499f9d..480d09e66a354677a229a9e8e656c6e0668b5089 100644 (file)
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -12,13 +12,13 @@
 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:       3
+Version:       3.11.4
+Release:       1
 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: 47c0308941a8f2c2f838e737f87cc3a1
 Source1:       ftdetect-proto.vim
 Patch0:                system-gtest.patch
 Patch1:                no-wrap-memcpy.patch
@@ -300,17 +300,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.22
 
 %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.22
 
 %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.22
 
 %files devel
 %defattr(644,root,root,755)