From 57dd385b2419a9d7f7fc9c36ad232bb15379f3f9963673b78890854e24c550eb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 18 Aug 2022 07:53:48 +0000 Subject: [PATCH] Accepting request 997605 from home:dirkmueller:Factory - update to 21.5: PHP * Added getContainingOneof and getRealContainingOneof to descriptor. * fix PHP readonly legacy files for nested messages Python * Fixed comparison of maps in Python. OBS-URL: https://build.opensuse.org/request/show/997605 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=129 --- 10355.patch | 28 ++++++++++++++-------------- baselibs.conf | 6 +++--- protobuf-21.4.tar.gz | 3 --- protobuf-21.5.tar.gz | 3 +++ protobuf.changes | 10 ++++++++++ protobuf.spec | 4 ++-- 6 files changed, 32 insertions(+), 22 deletions(-) delete mode 100644 protobuf-21.4.tar.gz create mode 100644 protobuf-21.5.tar.gz diff --git a/10355.patch b/10355.patch index 79264de..d39a719 100644 --- a/10355.patch +++ b/10355.patch @@ -7,16 +7,16 @@ Subject: [PATCH 1/2] Use release version instead of libtool version src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: protobuf-21.4/src/Makefile.am +Index: protobuf-21.5/src/Makefile.am =================================================================== ---- protobuf-21.4.orig/src/Makefile.am -+++ protobuf-21.4/src/Makefile.am +--- protobuf-21.5.orig/src/Makefile.am ++++ protobuf-21.5/src/Makefile.am @@ -18,7 +18,7 @@ else PTHREAD_DEF = endif --PROTOBUF_VERSION = 32:4:0 -+PROTOBUF_VERSION = 3.21.4 +-PROTOBUF_VERSION = 32:5:0 ++PROTOBUF_VERSION = 3.21.5 if GCC # Turn on all warnings except for sign comparison (we ignore sign comparison @@ -47,10 +47,10 @@ Index: protobuf-21.4/src/Makefile.am if HAVE_LD_VERSION_SCRIPT libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map -Index: protobuf-21.4/cmake/libprotobuf-lite.cmake +Index: protobuf-21.5/cmake/libprotobuf-lite.cmake =================================================================== ---- protobuf-21.4.orig/cmake/libprotobuf-lite.cmake -+++ protobuf-21.4/cmake/libprotobuf-lite.cmake +--- protobuf-21.5.orig/cmake/libprotobuf-lite.cmake ++++ protobuf-21.5/cmake/libprotobuf-lite.cmake @@ -112,7 +112,6 @@ if(protobuf_BUILD_SHARED_LIBS) endif() set_target_properties(libprotobuf-lite PROPERTIES @@ -59,10 +59,10 @@ Index: protobuf-21.4/cmake/libprotobuf-lite.cmake OUTPUT_NAME ${LIB_PREFIX}protobuf-lite DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite) -Index: protobuf-21.4/cmake/libprotobuf.cmake +Index: protobuf-21.5/cmake/libprotobuf.cmake =================================================================== ---- protobuf-21.4.orig/cmake/libprotobuf.cmake -+++ protobuf-21.4/cmake/libprotobuf.cmake +--- protobuf-21.5.orig/cmake/libprotobuf.cmake ++++ protobuf-21.5/cmake/libprotobuf.cmake @@ -128,7 +128,6 @@ if(protobuf_BUILD_SHARED_LIBS) endif() set_target_properties(libprotobuf PROPERTIES @@ -71,10 +71,10 @@ Index: protobuf-21.4/cmake/libprotobuf.cmake OUTPUT_NAME ${LIB_PREFIX}protobuf DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") add_library(protobuf::libprotobuf ALIAS libprotobuf) -Index: protobuf-21.4/cmake/libprotoc.cmake +Index: protobuf-21.5/cmake/libprotoc.cmake =================================================================== ---- protobuf-21.4.orig/cmake/libprotoc.cmake -+++ protobuf-21.4/cmake/libprotoc.cmake +--- protobuf-21.5.orig/cmake/libprotoc.cmake ++++ protobuf-21.5/cmake/libprotoc.cmake @@ -130,7 +130,6 @@ endif() set_target_properties(libprotoc PROPERTIES COMPILE_DEFINITIONS LIBPROTOC_EXPORTS diff --git a/baselibs.conf b/baselibs.conf index 1d32a84..5702f59 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libprotobuf3_21_4 -libprotoc3_21_4 -libprotobuf-lite3_21_4 +libprotobuf3_21_5 +libprotoc3_21_5 +libprotobuf-lite3_21_5 diff --git a/protobuf-21.4.tar.gz b/protobuf-21.4.tar.gz deleted file mode 100644 index e9d46e0..0000000 --- a/protobuf-21.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:990e47a163b4057f98b899eca591981b5b735872b58f59b9ead9cecabbb21a2a -size 5105058 diff --git a/protobuf-21.5.tar.gz b/protobuf-21.5.tar.gz new file mode 100644 index 0000000..30f344a --- /dev/null +++ b/protobuf-21.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a7e87e4166c358c63342dddcde6312faee06ea9d5bb4e2fa87d3478076f6639 +size 5104616 diff --git a/protobuf.changes b/protobuf.changes index 15a7de6..b53c581 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Aug 17 19:33:06 UTC 2022 - Dirk Müller + +- update to 21.5: + PHP + * Added getContainingOneof and getRealContainingOneof to descriptor. + * fix PHP readonly legacy files for nested messages + Python + * Fixed comparison of maps in Python. + ------------------------------------------------------------------- Thu Aug 4 20:50:38 UTC 2022 - Dirk Müller diff --git a/protobuf.spec b/protobuf.spec index f05ff20..c0ddd98 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -17,7 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define sover 3_21_4 +%define sover 3_21_5 %define tarname protobuf %define src_install_dir %{_prefix}/src/%{name} %define extra_java_flags -source 7 -target 7 @@ -27,7 +27,7 @@ %bcond_without python2 %bcond_without python3 Name: protobuf -Version: 21.4 +Version: 21.5 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause