- update to 23.2:

* Add missing header to Objective-c generator
  * Rollback of: Simplify protobuf Java message builder by
    removing methods that calls the super class only 
- drop python2 handling
- fix version handling and package the private libs again

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=149

baselibs.conf

@@ -1,3 +1,3 @@
-libprotobuf22_3_0
-libprotoc22_3_0
-libprotobuf-lite22_3_0
+libprotobuf22_3_2
+libprotoc22_3_2
+libprotobuf-lite22_3_2

protobuf-23.1.tar.gz

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

protobuf-23.2.tar.gz

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

protobuf.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jun 11 19:19:40 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- update to 23.2:
+  * Add missing header to Objective-c generator
+  * Rollback of: Simplify protobuf Java message builder by
+    removing methods that calls the super class only 
+- drop python2 handling
+- fix version handling and package the private libs again
+
 -------------------------------------------------------------------
 Wed May 24 06:32:33 UTC 2023 - Adrian Schröter <adrian@suse.de>
 

protobuf.spec

@@ -18,19 +18,19 @@
 
 %{!?make_build:%global make_build make %{?_smp_mflags}}
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define sover 22_3_0
+%define sover 22_3_2
 %define tarname protobuf
 %define src_install_dir %{_prefix}/src/%{name}
 %define extra_java_flags -source 7 -target 7
 # requires gmock, which is not yet in the distribution
 %bcond_with    check
-%bcond_with    python2
 %bcond_without java
 %bcond_without python3
 Name:           protobuf
-Version:        23.1
+Version:        23.2
 # python module have their own version specified in python/google/protobuf/__init__.py
-%define         pversion 4.23.1
+%global         gversion 23.2
+%global         pversion 4.%{gversion}
 Release:        0
 Summary:        Protocol Buffers - Google's data interchange format
 License:        BSD-3-Clause
@@ -49,7 +49,6 @@ BuildRequires:  abseil-cpp-devel >= 20230125
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
 BuildRequires:  pkgconfig(zlib)
@@ -142,17 +141,6 @@ This package contains the Python bindings for Google Protocol Buffers.
 
 %else
 
-%package -n python2-%{name}
-Summary:        Python2 Bindings for Google Protocol Buffers
-Group:          Development/Libraries/Python
-Provides:       python-%{name} = %{version}
-Obsoletes:      python-%{name} < %{version}
-Requires:       python2-six >= 1.9
-Version:        %pversion
-
-%description -n python2-%{name}
-This package contains the Python bindings for Google Protocol Buffers.
-
 %package -n python3-%{name}
 Summary:        Python3 Bindings for Google Protocol Buffers
 Group:          Development/Libraries/Python
@@ -178,7 +166,7 @@ This package contains the Java bindings for Google Protocol Buffers.
 # to use the autosetup macro
 mkdir gmock
 
-%if %{with python2} || %{with python3}
+%if %{with python3}
 # only needed for test suite which we don't call anyways.
 # googleapis is broken on sle12
 sed -i '/apputils/d' python/setup.py
@@ -188,6 +176,8 @@ sed -i '/google_test_dir/d' python/setup.py
 sed -i -e '/env python/d' python/google/protobuf/internal/*.py
 
 %build
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+
 # tests are not part of offical tar ball
 %cmake \
   -Dprotobuf_BUILD_TESTS=OFF \
@@ -217,9 +207,6 @@ popd
 %install
 %cmake_install
 install -Dm 0644 editors/proto.vim %{buildroot}%{_datadir}/vim/site/syntax/proto.vim
-# no need for that
-find %{buildroot} -type f -name "*.la" -delete -print
-rm %{buildroot}%_libdir/libutf8_*.a
 
 %if %{with java}
 pushd java
@@ -268,13 +255,13 @@ find %{buildroot}%{src_install_dir} -type f -name ".gitignore" -exec rm -f "{}"
 
 %files -n libprotobuf%{sover}
 %license LICENSE
-%{_libdir}/libprotobuf.so.*
+%{_libdir}/libprotobuf.so.%{gversion}.0
 
 %files -n libprotoc%{sover}
-%{_libdir}/libprotoc.so.*
+%{_libdir}/libprotoc.so.%{gversion}.0
 
 %files -n libprotobuf-lite%{sover}
-%{_libdir}/libprotobuf-lite.so.*
+%{_libdir}/libprotobuf-lite.so.%{gversion}.0
 
 %files devel
 %doc CONTRIBUTORS.txt README.md
@@ -287,6 +274,8 @@ find %{buildroot}%{src_install_dir} -type f -name ".gitignore" -exec rm -f "{}"
 %{_libdir}/libprotobuf-lite.so
 %{_libdir}/libprotobuf.so
 %{_libdir}/libprotoc.so
+%{_libdir}/libutf8_range.a
+%{_libdir}/libutf8_validity.a
 %{_datadir}/vim
 
 %files source
@@ -297,16 +286,13 @@ find %{buildroot}%{src_install_dir} -type f -name ".gitignore" -exec rm -f "{}"
 %{_javadir}/%{name}.jar
 %endif
 
-%if %{with python2} && ! 0%{?python_subpackage_only}
-%files -n python2-%{name}
-%license LICENSE
-%{python2_sitelib}/*
-%endif
-
-%if %{with python3} || ( %{with python2} && 0%{?python_subpackage_only} )
+%if %{with python3}
 %files %{python_files %{name}}
 %license LICENSE
-%{python_sitelib}/*
+%dir %{python_sitelib}/google
+%{python_sitelib}/google/protobuf
+%{python_sitelib}/protobuf*nspkg.pth
+%{python_sitelib}/protobuf*info
 %endif
 
 %changelog