pool/protobuf
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1043179 from home:dirkmueller:Factory

Browse Source 
- update to v21.12:
  * Python
  * Fix broken enum ranges (#11171)
  * Stop requiring extension fields to have a sythetic oneof (#11091)
  * Python runtime 4.21.10 not works generated code can not load valid
    proto.

OBS-URL: https://build.opensuse.org/request/show/1043179
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=139
This commit is contained in:
Dirk Mueller 2022-12-15 21:21:13 +00:00 committed by Git OBS Bridge
parent 1469165278
commit 5087dd2b49
6 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
10355.patch
View File

@ -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.11/src/Makefile.am
Index: protobuf-21.12/src/Makefile.am
===================================================================
--- protobuf-21.11.orig/src/Makefile.am
+++ protobuf-21.11/src/Makefile.am
--- protobuf-21.12.orig/src/Makefile.am
+++ protobuf-21.12/src/Makefile.am
@@ -18,7 +18,7 @@ else
PTHREAD_DEF =
endif
-PROTOBUF_VERSION = 32:11:0
+PROTOBUF_VERSION = 3.21.11
-PROTOBUF_VERSION = 32:12:0
+PROTOBUF_VERSION = 3.21.12
if GCC
# Turn on all warnings except for sign comparison (we ignore sign comparison
@ -47,10 +47,10 @@ Index: protobuf-21.11/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.11/cmake/libprotobuf-lite.cmake
Index: protobuf-21.12/cmake/libprotobuf-lite.cmake
===================================================================
--- protobuf-21.11.orig/cmake/libprotobuf-lite.cmake
+++ protobuf-21.11/cmake/libprotobuf-lite.cmake
--- protobuf-21.12.orig/cmake/libprotobuf-lite.cmake
+++ protobuf-21.12/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.11/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.11/cmake/libprotobuf.cmake
Index: protobuf-21.12/cmake/libprotobuf.cmake
===================================================================
--- protobuf-21.11.orig/cmake/libprotobuf.cmake
+++ protobuf-21.11/cmake/libprotobuf.cmake
--- protobuf-21.12.orig/cmake/libprotobuf.cmake
+++ protobuf-21.12/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.11/cmake/libprotobuf.cmake
OUTPUT_NAME ${LIB_PREFIX}protobuf
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf ALIAS libprotobuf)
Index: protobuf-21.11/cmake/libprotoc.cmake
Index: protobuf-21.12/cmake/libprotoc.cmake
===================================================================
--- protobuf-21.11.orig/cmake/libprotoc.cmake
+++ protobuf-21.11/cmake/libprotoc.cmake
--- protobuf-21.12.orig/cmake/libprotoc.cmake
+++ protobuf-21.12/cmake/libprotoc.cmake
@@ -130,7 +130,6 @@ endif()
set_target_properties(libprotoc PROPERTIES
COMPILE_DEFINITIONS LIBPROTOC_EXPORTS

6
baselibs.conf
View File

@ -1,3 +1,3 @@
libprotobuf3_21_11
libprotoc3_21_11
libprotobuf-lite3_21_11
libprotobuf3_21_12
libprotoc3_21_12
libprotobuf-lite3_21_12

3
protobuf-21.11.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1d6dd2cbb5d87e17af41cadb720322ce7e13af826268707bd8db47e5654770b
size 5141374

BIN
protobuf-21.12.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

10
protobuf.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Dec 15 16:18:26 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to v21.12:
* Python
* Fix broken enum ranges (#11171)
* Stop requiring extension fields to have a sythetic oneof (#11091)
* Python runtime 4.21.10 not works generated code can not load valid
proto.
-------------------------------------------------------------------
Thu Dec 8 09:16:25 UTC 2022 - Dirk Müller <dmueller@suse.com>

6
protobuf.spec
View File

@ -17,7 +17,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define sover 3_21_11
%define sover 3_21_12
%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.11
Version: 21.12
Release: 0
Summary: Protocol Buffers - Google's data interchange format
License: BSD-3-Clause
@ -49,7 +49,7 @@ BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
BuildRequires: zlib-devel
BuildRequires: pkgconfig(zlib)
%if %{with check}
BuildRequires: libgmock-devel >= 1.7.0
%endif