From 67ba80f1fd34ed104efc4b476c53435babfafb12 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Thu, 15 May 2025 10:08:50 +1400 Subject: [PATCH] distinguish between statically and dynamically compiled cmake dir to prevent BEP binary differences Signed-off-by: zhongtao --- protobuf.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/protobuf.spec b/protobuf.spec index 9ef7027..be4b598 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -15,7 +15,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 25.1 -Release: 9 +Release: 10 License: BSD-3-Clause URL: https://github.com/protocolbuffers/protobuf Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz @@ -301,6 +301,7 @@ fail=1 %install %ninja_install -C build-static mv %{buildroot}%{_libdir}/pkgconfig/protobuf.pc %{buildroot}%{_libdir}/pkgconfig/protobuf-static.pc +mv %{buildroot}%{_libdir}/cmake/protobuf %{buildroot}%{_libdir}/cmake/protobuf-static %ninja_install -C build %if %{with python} @@ -354,6 +355,7 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %{_datadir}/vim/vimfiles/syntax/proto.vim %{_libdir}/cmake/utf8_range %{_libdir}/cmake/protobuf +%{_libdir}/cmake/protobuf-static %{_libdir}/libutf8_range.a %{_libdir}/libutf8_validity.a %{_includedir}/java/core/src/main/java/com/google/protobuf/java_features.proto @@ -399,6 +401,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Thu May 15 2025 zhongtao - 25.1-10 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: distinguish between statically and dynamically compiled cmake dir to prevent BEP binary differences + * Fri May 09 2025 zhongtao - 25.1-9 - Type:bugfix - ID:NA -- Gitee