From dd0e727864f0b4976aaadea965071257a7488b0e8f4d6ec368630f89ad73d700 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 21 Dec 2023 13:53:39 +0000 Subject: [PATCH] - build against modern python on sle15 - drop patches: * Reduce memory consumption of MessageSet parsing * Add back a filegroup for :well_known_protos (#10061) * Fix shadowing warnings * Fix for issue #8484, constant initialization doesn't compile in msvc clang-cl environment * Use ArrayList copy constructor * Fix ReferenceError: window is not defined when getting the global object * Fix memory leak in MessageClass.encode * Override Map.clone to use Map's dup method * Ruby: build extensions for arm64-darwin * Add class method Timestamp.from_time to ruby well known types * Adopt pure ruby DSL implementation for JRuby * Fix for descriptor_pb.rb: google/protobuf should be required first * Add python-requires in setup.py * Add python 3.10 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=169 --- protobuf.changes | 35 ++++++++++++++++++++--------------- protobuf.spec | 7 ++++--- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/protobuf.changes b/protobuf.changes index e9eca29..a6eb8d8 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 21 13:53:29 UTC 2023 - Dirk Müller + +- build against modern python on sle15 + ------------------------------------------------------------------- Mon Oct 30 10:47:11 UTC 2023 - Fridrich Strba @@ -137,7 +142,7 @@ Mon Apr 24 12:30:51 UTC 2023 - Adrian Schröter - python sub packages version is set 4.22.3 as defined in python/google/protobuf/__init__.py to stay compatible - skip python2 builds by default -- drop patches: +- drop patches: * 10355.patch, * gcc12-disable-__constinit-with-c++-11.patch (merged upstream) - added patches: @@ -206,7 +211,7 @@ Mon Sep 19 07:27:02 UTC 2022 - Dirk Müller - update to 21.6: C++: - * Reduce memory consumption of MessageSet parsing + * Reduce memory consumption of MessageSet parsing ------------------------------------------------------------------- Wed Aug 17 19:33:06 UTC 2022 - Dirk Müller @@ -252,7 +257,7 @@ Mon Jul 25 07:11:14 UTC 2022 - Dirk Müller * Python * Make //:protobuf_python and //:well_known_types_py_pb2 public (#10118) * Bazel - * Add back a filegroup for :well_known_protos (#10061) + * Add back a filegroup for :well_known_protos (#10061) ------------------------------------------------------------------- Sun Jul 3 07:50:16 UTC 2022 - Paolo Stivanin @@ -517,31 +522,31 @@ Mon Jan 24 13:08:10 UTC 2022 - Paolo Stivanin * Make proto2::Message::DiscardUnknownFields() non-virtual * Separate RepeatedPtrField into its own header file * For default floating point values of 0, consider all bits significant - * Fix shadowing warnings - * Fix for issue #8484, constant initialization doesn't compile in msvc clang-cl environment + * Fix shadowing warnings + * Fix for issue #8484, constant initialization doesn't compile in msvc clang-cl environment Java: * Improve performance characteristics of UnknownFieldSet parsing * For default floating point values of 0, consider all bits significant * Annotate //java/com/google/protobuf/util/... with nullness annotations - * Use ArrayList copy constructor + * Use ArrayList copy constructor Bazel: * Ensure that release archives contain everything needed for Bazel * Align dependency handling with Bazel best practices Javascript: - * Fix ReferenceError: window is not defined when getting the global object + * Fix ReferenceError: window is not defined when getting the global object Ruby: - * Fix memory leak in MessageClass.encode - * Override Map.clone to use Map's dup method - * Ruby: build extensions for arm64-darwin - * Add class method Timestamp.from_time to ruby well known types - * Adopt pure ruby DSL implementation for JRuby + * Fix memory leak in MessageClass.encode + * Override Map.clone to use Map's dup method + * Ruby: build extensions for arm64-darwin + * Add class method Timestamp.from_time to ruby well known types + * Adopt pure ruby DSL implementation for JRuby * Add size to Map class - * Fix for descriptor_pb.rb: google/protobuf should be required first + * Fix for descriptor_pb.rb: google/protobuf should be required first Python: * Proto2 DecodeError now includes message name in error message * Make MessageToDict convert map keys to strings - * Add python-requires in setup.py - * Add python 3.10 + * Add python-requires in setup.py + * Add python 3.10 ------------------------------------------------------------------- Wed Jul 28 08:00:56 UTC 2021 - Fridrich Strba diff --git a/protobuf.spec b/protobuf.spec index 3d9adb6..64b7ebf 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -24,6 +24,7 @@ %bcond_with check %bcond_without java %bcond_without python3 +%{?sle15_python_module_pythons} Name: protobuf Version: 23.4 %global sover 23_4_0 @@ -38,7 +39,7 @@ Source2: baselibs.conf Source1000: %{name}-rpmlintrc Patch0: add-missing-stdint-header.patch BuildRequires: %{python_module abseil} -BuildRequires: %{python_module devel} +BuildRequires: %{python_module devel >= 3.7} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module setuptools} BuildRequires: abseil-cpp-devel >= 20230125 @@ -56,8 +57,8 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 %endif -%if 0%{?suse_version} >= 1550 -# TW: generate subpackages for every python3 flavor +%if 0%{?suse_version} >= 1500 +# generate subpackages for every python3 flavor %define python_subpackage_only 1 %python_subpackages %else