From 3640154e14065a95707e5b90222b0b1995102e94 Mon Sep 17 00:00:00 2001 From: dongyuzhen Date: Mon, 19 May 2025 16:10:15 +0800 Subject: [PATCH] distinguish between statically and dynamically compiled pc files and cmake dir to prevent BEP binary differ (cherry picked from commit 2c80b8412f2d176d5600520090759c24180e6b24) --- protobuf.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/protobuf.spec b/protobuf.spec index f455630..4fa7fdf 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -11,7 +11,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 25.1 -Release: 7 +Release: 8 License: BSD URL: https://github.com/protocolbuffers/protobuf Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz @@ -304,6 +304,8 @@ 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} @@ -352,6 +354,7 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %{_includedir}/utf8_validity.h %{_libdir}/libprotobuf.so %{_libdir}/libprotoc.so +%{_libdir}/pkgconfig/protobuf-static.pc %{_libdir}/pkgconfig/protobuf.pc %{_libdir}/pkgconfig/utf8_range.pc %doc examples/add_person.cc examples/addressbook.proto examples/list_people.cc examples/Makefile examples/README.md @@ -360,6 +363,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 @@ -405,6 +409,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Mon May 19 2025 dongyuzhen - 25.1-8 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: distinguish between statically and dynamically compiled pc files and cmake dir to prevent BEP binary differences + * Wed Sep 25 2024 zhangxianting - 25.1-7 - Type:bugfix - ID:NA -- Gitee