diff --git a/qpid-proton.spec b/qpid-proton.spec index 35d4557412fada001aa7209ee7d9a7125d0241d3..3452601bf93815234e213d851a061e3a9c5cfcbd 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -1,17 +1,11 @@ -%{?filter_setup: -%filter_provides_in %{_datadir}/proton/examples/ -%filter_requires_in %{_datadir}/proton/examples/ -%filter_setup -} +%undefine __cmake_in_source_build -%global proton_licensedir %{_licensedir}/proton -%{!?_licensedir: -%global license %doc -%global proton_licensedir %{_datadir}/proton} +%global __requires_exclude_from ^%{_datadir}/proton/examples/.*$ +%global __provides_exclude_from ^%{_datadir}/proton/examples/.*$ Name: qpid-proton Version: 0.39.0 -Release: 1 +Release: 2 Summary: A high performance and lightweight library for messaging applications License: Apache-2.0 URL: http://qpid.apache.org/proton/ @@ -95,8 +89,6 @@ This package contains some tests for qpid-proton. %autosetup -n %{name}-%{version} -p1 %build -rm -rf buildpython3 && mkdir buildpython3 -pushd buildpython3 python_includes=$(ls -d /usr/include/python3*) %cmake \ -DSYSINSTALL_BINDINGS=ON \ @@ -104,14 +96,13 @@ python_includes=$(ls -d /usr/include/python3*) -DENABLE_FUZZ_TESTING=NO \ "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS -Wno-error=format-security" \ "-DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS $CXXFLAGS -Wno-error=format-security" \ - .. -make all docs -j1 -(pushd python; %py3_build) +%cmake_build +%cmake_build --target docs +(pushd %{__cmake_builddir}/python; %py3_build) %install -pushd buildpython3 -%make_install -(pushd python; %py3_install) +%cmake_install +(pushd %{__cmake_builddir}/python; %py3_install) find %{buildroot}%{_datadir}/proton/examples/python -name "*.py" -exec sed -i 's/!\/usr\/bin\/env python/!\/usr\/bin\/python3/' {} \; echo '#!/usr/bin/python3' > %{buildroot}%{_datadir}/proton/examples/python/proton_server.py.original @@ -127,12 +118,6 @@ do rm -rf ${fpath}/ruby done -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - %files c-cpp %dir %{_datadir}/proton %license %{_datadir}/proton/LICENSE.txt @@ -146,14 +131,12 @@ done %{_libdir}/cmake/ProtonCpp %files c-help -%defattr(-,root,root,-) %license %{_datadir}/proton/LICENSE.txt %doc %{_datadir}/proton/examples/README.md %doc %{_datadir}/proton/docs/api-c %doc %{_datadir}/proton/examples/c/* %files cpp-help -%defattr(-,root,root,-) %license %{_datadir}/proton/LICENSE.txt %{_datadir}/proton/docs/api-cpp %doc %{_datadir}/proton/examples/cpp/* @@ -162,7 +145,6 @@ done %{python3_sitearch}/* %files -n python-qpid-proton-help -%defattr(-,root,root,-) %license %{_datadir}/proton/LICENSE.txt %doc %{_datadir}/proton/docs/api-py %doc %{_datadir}/proton/examples/python @@ -172,6 +154,9 @@ done %doc %{_datadir}/proton/tests %changelog +* Tue Nov 12 2024 Funda Wang - 0.39.0-2 +- adopt to new cmake macro + * Thu Nov 07 2024 chenyaqiang - 0.39.0-1 - Update to 0.39.0: * Frame dumps truncated if there is a zero length string