diff --git a/protobuf.spec b/protobuf.spec index c4b6ac89eee0bde3674950ee06793f7a9fb57d89..92173729a2c101ec03533ec3d5c801d7fed501a8 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -7,7 +7,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 25.1 -Release: 2 +Release: 3 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 @@ -19,7 +19,7 @@ Patch9001: 0001-Fix-CC-compiler-support.patch BuildRequires: cmake gcc-c++ emacs zlib-devel gmock-devel gtest-devel jsoncpp-devel BuildRequires: fdupes pkgconfig python-rpm-macros pkgconfig(zlib) ninja-build -BuildRequires: abseil-cpp-devel >= 20230802 +BuildRequires: abseil-cpp-devel >= 20230802 chrpath %description @@ -249,7 +249,7 @@ export CMAKE_BUILD_DIR=build-static -Dprotobuf_USE_EXTERNAL_GTEST:BOOL=ON \ -Dprotobuf_ABSL_PROVIDER=package \ -Dprotobuf_BUILD_TESTS:BOOL=OFF \ - -DCMAKE_CXX_FLAGS="-fPIC" \ + -DCMAKE_CXX_FLAGS="-Wl,-z,now -fPIE -fPIC" \ -DCMAKE_C_COMPILER=%{__cc} \ -DCMAKE_CXX_COMPILER=%{__cxx} \ -G Ninja \ @@ -315,6 +315,9 @@ install -p -m 0644 editors/protobuf-mode.el %{buildroot}%{_emacs_sitelispdir}/%{ install -p -m 0644 editors/protobuf-mode.elc %{buildroot}%{_emacs_sitelispdir}/%{name} mkdir -p %{buildroot}%{_emacs_sitestartdir} install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} +chrpath -d %{buildroot}%{_libdir}/libprotobuf.so.%{so_version}.* +chrpath -d %{buildroot}%{_libdir}/libprotoc.so.%{so_version}.* +chrpath -d %{buildroot}%{_bindir}/protoc-%{so_version}.* %ldconfig_scriptlets %ldconfig_scriptlets lite @@ -392,6 +395,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Mon Apr 08 2024 zhangxianting - 25.1-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove rpath and enable pie + * Wed Mar 20 2024 wangqiang - 25.1-2 - Support package build with clang