rpm/protobuf
SHA256
1
0
Fork 0
forked from pool/protobuf
Code Pull Requests Activity

Accepting request 1041352 from home:dirkmueller:Factory

Browse Source 
- update to 21.11:
  * Python
  * Add license file to pypi wheels (#10936)
  * Fix round-trip bug (#10158)

OBS-URL: https://build.opensuse.org/request/show/1041352
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=137
This commit is contained in:
Dirk Mueller 2022-12-08 13:03:55 +00:00 committed by Git OBS Bridge
parent dfc49e70b9
commit 1469165278
6 changed files with 30 additions and 22 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 ++++---- src/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
Index: protobuf-21.10/src/Makefile.am Index: protobuf-21.11/src/Makefile.am
=================================================================== ===================================================================
--- protobuf-21.10.orig/src/Makefile.am --- protobuf-21.11.orig/src/Makefile.am
+++ protobuf-21.10/src/Makefile.am +++ protobuf-21.11/src/Makefile.am
@@ -18,7 +18,7 @@ else @@ -18,7 +18,7 @@ else
PTHREAD_DEF = PTHREAD_DEF =
endif endif
-PROTOBUF_VERSION = 32:10:0 -PROTOBUF_VERSION = 32:11:0
+PROTOBUF_VERSION = 3.21.10 +PROTOBUF_VERSION = 3.21.11
if GCC if GCC
# Turn on all warnings except for sign comparison (we ignore sign comparison # Turn on all warnings except for sign comparison (we ignore sign comparison
@ -47,10 +47,10 @@ Index: protobuf-21.10/src/Makefile.am
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map
EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map
Index: protobuf-21.10/cmake/libprotobuf-lite.cmake Index: protobuf-21.11/cmake/libprotobuf-lite.cmake
=================================================================== ===================================================================
--- protobuf-21.10.orig/cmake/libprotobuf-lite.cmake --- protobuf-21.11.orig/cmake/libprotobuf-lite.cmake
+++ protobuf-21.10/cmake/libprotobuf-lite.cmake +++ protobuf-21.11/cmake/libprotobuf-lite.cmake
@@ -112,7 +112,6 @@ if(protobuf_BUILD_SHARED_LIBS) @@ -112,7 +112,6 @@ if(protobuf_BUILD_SHARED_LIBS)
endif() endif()
set_target_properties(libprotobuf-lite PROPERTIES set_target_properties(libprotobuf-lite PROPERTIES
@ -59,10 +59,10 @@ Index: protobuf-21.10/cmake/libprotobuf-lite.cmake
OUTPUT_NAME ${LIB_PREFIX}protobuf-lite OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite) add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
Index: protobuf-21.10/cmake/libprotobuf.cmake Index: protobuf-21.11/cmake/libprotobuf.cmake
=================================================================== ===================================================================
--- protobuf-21.10.orig/cmake/libprotobuf.cmake --- protobuf-21.11.orig/cmake/libprotobuf.cmake
+++ protobuf-21.10/cmake/libprotobuf.cmake +++ protobuf-21.11/cmake/libprotobuf.cmake
@@ -128,7 +128,6 @@ if(protobuf_BUILD_SHARED_LIBS) @@ -128,7 +128,6 @@ if(protobuf_BUILD_SHARED_LIBS)
endif() endif()
set_target_properties(libprotobuf PROPERTIES set_target_properties(libprotobuf PROPERTIES
@ -71,10 +71,10 @@ Index: protobuf-21.10/cmake/libprotobuf.cmake
OUTPUT_NAME ${LIB_PREFIX}protobuf OUTPUT_NAME ${LIB_PREFIX}protobuf
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf ALIAS libprotobuf) add_library(protobuf::libprotobuf ALIAS libprotobuf)
Index: protobuf-21.10/cmake/libprotoc.cmake Index: protobuf-21.11/cmake/libprotoc.cmake
=================================================================== ===================================================================
--- protobuf-21.10.orig/cmake/libprotoc.cmake --- protobuf-21.11.orig/cmake/libprotoc.cmake
+++ protobuf-21.10/cmake/libprotoc.cmake +++ protobuf-21.11/cmake/libprotoc.cmake
@@ -130,7 +130,6 @@ endif() @@ -130,7 +130,6 @@ endif()
set_target_properties(libprotoc PROPERTIES set_target_properties(libprotoc PROPERTIES
COMPILE_DEFINITIONS LIBPROTOC_EXPORTS COMPILE_DEFINITIONS LIBPROTOC_EXPORTS

6
baselibs.conf
View File

@ -1,3 +1,3 @@
libprotobuf3_21_10 libprotobuf3_21_11
libprotoc3_21_10 libprotoc3_21_11
libprotobuf-lite3_21_10 libprotobuf-lite3_21_11

3
protobuf-21.10.tar.gz
View File

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

3
protobuf-21.11.tar.gz Normal file
View File

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

8
protobuf.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Dec 8 09:16:25 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 21.11:
* Python
* Add license file to pypi wheels (#10936)
* Fix round-trip bug (#10158)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 5 20:51:53 UTC 2022 - Dirk Müller <dmueller@suse.com> Mon Dec 5 20:51:53 UTC 2022 - Dirk Müller <dmueller@suse.com>

4
protobuf.spec
View File

@ -17,7 +17,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define sover 3_21_10 %define sover 3_21_11
%define tarname protobuf %define tarname protobuf
%define src_install_dir %{_prefix}/src/%{name} %define src_install_dir %{_prefix}/src/%{name}
%define extra_java_flags -source 7 -target 7 %define extra_java_flags -source 7 -target 7
@ -27,7 +27,7 @@
%bcond_without python2 %bcond_without python2
%bcond_without python3 %bcond_without python3
Name: protobuf Name: protobuf
Version: 21.10 Version: 21.11
Release: 0 Release: 0
Summary: Protocol Buffers - Google's data interchange format Summary: Protocol Buffers - Google's data interchange format
License: BSD-3-Clause License: BSD-3-Clause