Accepting request 1228295 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/1228295
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protobuf21?expand=0&rev=4

protobuf21.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Nov 29 06:56:17 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build on some architectures in SLE15 where the default
+  compiler gives internal compiler error
+
+-------------------------------------------------------------------
+Fri Aug  9 09:02:58 UTC 2024 - Christian Goll <cgoll@suse.com>
+
+- switch to cmake buidling to that cmake projects can consume it
+
 -------------------------------------------------------------------
 Thu Feb 15 12:11:20 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

protobuf21.spec

@@ -25,6 +25,9 @@
 %bcond_with    check
 %bcond_with    java
 %bcond_with    python3
+%if 0%{?gcc_version} < 11
+%define with_gcc 11
+%endif
 Name:           protobuf21
 Version:        21.12
 Release:        0
@@ -43,10 +46,9 @@ Provides:       protobuf = %{version}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module python-dateutil}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  autoconf
-BuildRequires:  automake
+BuildRequires:  cmake
 BuildRequires:  fdupes
-BuildRequires:  gcc-c++
+BuildRequires:  gcc%{?with_gcc}-c++
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
@@ -163,11 +165,16 @@ sed -i '/google_test_dir/d' python/setup.py
 sed -i -e '/env python/d' python/google/protobuf/internal/*.py
 
 %build
-autoreconf -fvi
-%configure \
-	--disable-static
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 
-%make_build
+%if 0%{?with_gcc}
+export CXX=g++-%{with_gcc}
+export CC=gcc-%{with_gcc}
+%endif
+%cmake \
+  -Dprotobuf_BUILD_TESTS=OFF \
+  %{nil}
+%cmake_build
 
 %if %{with java}
 pushd java
@@ -191,7 +198,7 @@ popd
 %endif
 
 %install
-%make_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
@@ -227,22 +234,24 @@ popd
 
 %files -n libprotobuf%{sover}
 %license LICENSE
-%{_libdir}/libprotobuf-3.%{version}.so
+%{_libdir}/libprotobuf.so.3.%{version}*
 
 %files -n libprotoc%{sover}
-%{_libdir}/libprotoc-3.%{version}.so
+%{_libdir}/libprotoc.so.3.%{version}*
 
 %files -n libprotobuf-lite%{sover}
-%{_libdir}/libprotobuf-lite-3.%{version}.so
+%{_libdir}/libprotobuf-lite.so.3.%{version}*
 
 %files devel
 %doc CHANGES.txt CONTRIBUTORS.txt README.md
 %{_bindir}/protoc
+%{_bindir}/protoc-3.%{version}*
 %{_includedir}/google
 %{_libdir}/pkgconfig/*
 %{_libdir}/libprotobuf-lite.so
 %{_libdir}/libprotobuf.so
 %{_libdir}/libprotoc.so
+%{_libdir}/cmake/protobuf
 %{_datadir}/vim
 
 %if %{with java}