Accepting request 1219411 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/1219411
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protobuf?expand=0&rev=83

_multibuild

@@ -1,4 +1,5 @@
 <multibuild>
+  <package>python-protobuf</package>
   <package>protobuf-java</package>
 </multibuild>
 

baselibs.conf

@@ -1,4 +1,4 @@
-libprotobuf29_3_0
+libprotobuf28_3_0
-libprotoc29_3_0
+libprotoc28_3_0
-libprotobuf-lite29_3_0
+libprotobuf-lite28_3_0
-libutf8_range-29_3_0
+libutf8_range-28_3_0

protobuf-java-4.28.3.pom

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>4.29.3</version>
+    <version>4.28.3</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

protobuf-java-util-4.28.3.pom

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>4.29.3</version>
+    <version>4.28.3</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>
@@ -16,37 +16,32 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>4.29.3</version>
+      <version>4.28.3</version>
     </dependency>
             <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.8.9</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
             <version>2.18.0</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>32.0.1-jre</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.google.j2objc</groupId>
             <artifactId>j2objc-annotations</artifactId>
             <version>2.8</version>
-            <scope>runtime</scope>
         </dependency>
   </dependencies>
 

protobuf-java-util-removescope.patch

@@ -1,34 +0,0 @@
---- pom.xml	2025-05-02 23:04:51.224332863 +0200
-+++ pom.xml	2025-05-02 23:05:30.728959217 +0200
-@@ -22,31 +22,26 @@
-             <groupId>com.google.code.findbugs</groupId>
-             <artifactId>jsr305</artifactId>
-             <version>3.0.2</version>
--            <scope>runtime</scope>
-         </dependency>
-         <dependency>
-             <groupId>com.google.code.gson</groupId>
-             <artifactId>gson</artifactId>
-             <version>2.8.9</version>
--            <scope>runtime</scope>
-         </dependency>
-         <dependency>
-             <groupId>com.google.errorprone</groupId>
-             <artifactId>error_prone_annotations</artifactId>
-             <version>2.18.0</version>
--            <scope>runtime</scope>
-         </dependency>
-         <dependency>
-             <groupId>com.google.guava</groupId>
-             <artifactId>guava</artifactId>
-             <version>32.0.1-jre</version>
--            <scope>runtime</scope>
-         </dependency>
-         <dependency>
-             <groupId>com.google.j2objc</groupId>
-             <artifactId>j2objc-annotations</artifactId>
-             <version>2.8</version>
--            <scope>runtime</scope>
-         </dependency>
-   </dependencies>
- 

protobuf-java.changes

@@ -1,13 +1,3 @@
--------------------------------------------------------------------
-Thu May  1 09:05:08 UTC 2025 - Antonello Tartamo <antonello.tartamo@suse.com>
-
-- update to 29.3
-  * Fix cmake installation location of java and go features.
-  * Add .bazeliskrc for protobuf repo to tell bazelisk to use 7.1.2 by default. 
-  * Update artifact actions to v4
-  * Added protobuf-java-util-removescope.patch to avoid Java compilation errors
-    due to dependencies marked as runtime.
-
 -------------------------------------------------------------------
 Mon Oct 28 08:20:17 UTC 2024 - Dirk Müller <dmueller@suse.com>
 

protobuf-java.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package protobuf-java
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,9 +18,8 @@
 
 
 %define tarname protobuf
-%define patchjuname protobuf-java-util-removescope.patch
 Name:           protobuf-java
-Version:        29.3
+Version:        28.3
 Release:        0
 Summary:        Java Bindings for Google Protocol Buffers
 License:        BSD-3-Clause
@@ -30,7 +29,6 @@ Source0:        https://github.com/protocolbuffers/protobuf/releases/download/v%
 Source1:        https://repo1.maven.org/maven2/com/google/protobuf/%{name}/4.%{version}/%{name}-4.%{version}.pom
 Source2:        https://repo1.maven.org/maven2/com/google/protobuf/%{name}lite/4.%{version}/%{name}lite-4.%{version}.pom
 Source3:        https://repo1.maven.org/maven2/com/google/protobuf/%{name}-util/4.%{version}/%{name}-util-4.%{version}.pom
-Source4:        %{patchjuname}
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
@@ -88,10 +86,6 @@ pushd java
 cp %{SOURCE1} core/pom.xml
 cp %{SOURCE2} lite/pom.xml
 cp %{SOURCE3} util/pom.xml
-cp %{SOURCE4} util/%{patchjuname}
-pushd util
-patch -p0 < %{patchjuname}
-popd
 %pom_disable_module kotlin
 %pom_disable_module kotlin-lite
 %pom_remove_plugin :animal-sniffer-maven-plugin

protobuf-javalite-4.28.3.pom

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>4.29.3</version>
+    <version>4.28.3</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>

protobuf.changes

@@ -1,13 +1,3 @@
--------------------------------------------------------------------
-Thu May  1 09:05:08 UTC 2025 - Antonello Tartamo <antonello.tartamo@suse.com>
-
-- update to 29.3
-  * Fix cmake installation location of java and go features.
-  * Add .bazeliskrc for protobuf repo to tell bazelisk to use 7.1.2 by default. 
-  * Update artifact actions to v4
-  * Added protobuf-java-util-removescope.patch to avoid Java compilation errors
-    due to dependencies marked as runtime.
-
 -------------------------------------------------------------------
 Mon Oct 28 08:20:17 UTC 2024 - Dirk Müller <dmueller@suse.com>
 
@@ -35,7 +25,6 @@ Fri Oct 25 15:24:11 UTC 2024 - Dirk Müller <dmueller@suse.com>
     .com/protocolbuffers/protobuf/commit/3ea568a9b6107ebf0d617c47
     6f53a31490fd3182)
   * Mute the minor version warning
-  * fixed (bsc#1230778, CVE-2024-7254)
 
 -------------------------------------------------------------------
 Thu Oct 24 20:56:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>

protobuf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package protobuf
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -20,7 +20,7 @@
 %define tarname protobuf
 # see cmake/abseil-cpp.cmake and src/google/protobuf/port_def.inc
 %define abseil_min_version 20230125.3
-%global         sover 29_3_0
+%global         sover 28_3_0
 %if 0%{?gcc_version} < 11
 %define with_gcc 11
 %endif
@@ -66,7 +66,7 @@
 %global protoc_arch sparc_64
 %endif
 Name:           protobuf
-Version:        29.3
+Version:        28.3
 Release:        0
 Summary:        Protocol Buffers - Google's data interchange format
 License:        BSD-3-Clause
@@ -206,7 +206,6 @@ install -Dm 0644 editors/proto.vim %{buildroot}%{_datadir}/vim/site/syntax/proto
 # manual ln that we could not manage to get into versionize-shlibs.patch
 ln -s libutf8_range-%{version}.0.so %{buildroot}/%{_libdir}/libutf8_range.so
 ln -s libutf8_validity-%{version}.0.so %{buildroot}/%{_libdir}/libutf8_validity.so
-install -D java/core/src/main/resources/google/protobuf/java_features.proto %{buildroot}%{_includedir}/java/core/src/main/resources/google/protobuf/java_features.proto
 
 # create maven metadata for the protoc executable
 install -dm 0755 %{buildroot}%{_datadir}/maven-metadata

python-protobuf.spec

@@ -0,0 +1,71 @@
+#
+# spec file for package python-protobuf
+#
+# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define baseversion 28.3
+%{?sle15_python_module_pythons}
+Name:           python-protobuf
+Version:        5.%{baseversion}
+Release:        0
+Summary:        Python Bindings for Google Protocol Buffers
+License:        BSD-3-Clause
+Group:          Development/Libraries/Python
+URL:            https://github.com/protocolbuffers/protobuf
+Source0:        https://files.pythonhosted.org/packages/source/p/protobuf/protobuf-%{version}.tar.gz
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module python-dateutil}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
+BuildRequires:  fdupes
+%python_subpackages
+
+%description
+Protocol Buffers are a way of encoding structured data in an efficient yet
+extensible format. Google uses Protocol Buffers for almost all of its internal
+RPC protocols and file formats.
+
+This package contains the Python bindings for Google Protocol Buffers.
+
+%prep
+%autosetup -p1 -n protobuf-%{version}
+
+# The previous blank line is crucial for older system being able
+# to use the autosetup macro
+
+grep -qF "'%{version}'" google/protobuf/__init__.py
+
+# kill shebang that we do not really want
+sed -i -e '/env python/d' google/protobuf/internal/*.py
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
+
+%fdupes %{buildroot}%{_prefix}
+
+%files %{python_files}
+%license LICENSE
+%{python_sitearch}/google
+%{python_sitearch}/protobuf*nspkg.pth
+%{python_sitearch}/protobuf-%{version}.dist-info
+
+%changelog

versionize-shlibs.patch

@@ -16,10 +16,10 @@ slightly different from PR19009 while the PR is unmerged.
  third_party/utf8_range/CMakeLists.txt |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: protobuf-29.3/third_party/utf8_range/CMakeLists.txt
+Index: protobuf-28.3/third_party/utf8_range/CMakeLists.txt
 ===================================================================
---- protobuf-29.3.orig/third_party/utf8_range/CMakeLists.txt
+--- protobuf-28.3.orig/third_party/utf8_range/CMakeLists.txt
-+++ protobuf-29.3/third_party/utf8_range/CMakeLists.txt
++++ protobuf-28.3/third_party/utf8_range/CMakeLists.txt
 @@ -19,6 +19,9 @@ add_library (utf8_range
  # A heavier-weight C++ wrapper that supports Abseil.
  add_library (utf8_validity utf8_validity.cc utf8_range.c)