Irina Boverman 5 years ago
parent 6d1b36a83c
commit 3faa59cdfc

@ -10,9 +10,11 @@
%filter_setup %filter_setup
} }
%undefine __cmake_in_source_build
Name: qpid-proton Name: qpid-proton
Version: 0.31.0 Version: 0.31.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: A high performance, lightweight messaging library Summary: A high performance, lightweight messaging library
License: ASL 2.0 License: ASL 2.0
URL: http://qpid.apache.org/proton/ URL: http://qpid.apache.org/proton/
@ -227,8 +229,9 @@ python_includes=$(ls -d /usr/include/python3*)
"-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS -Wno-error=format-security" \ "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS -Wno-error=format-security" \
"-DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS $CXXFLAGS -Wno-error=format-security" \ "-DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS $CXXFLAGS -Wno-error=format-security" \
.. ..
#make all docs %{?_smp_mflags} %cmake_build all docs -j1
make all docs -j1 pwd
find . -name dist
(cd python/dist; %py3_build) (cd python/dist; %py3_build)
@ -236,7 +239,9 @@ make all docs -j1
rm -rf %{buildroot} rm -rf %{buildroot}
cd buildpython3 cd buildpython3
%make_install %cmake_install
pwd
find . -name dist
(cd python/dist; %py3_install) (cd python/dist; %py3_install)
find %{buildroot}%{proton_datadir}/examples/python -name "*.py" -exec sed -i 's/!\/usr\/bin\/env python/!\/usr\/bin\/python3/' {} \; find %{buildroot}%{proton_datadir}/examples/python -name "*.py" -exec sed -i 's/!\/usr\/bin\/env python/!\/usr\/bin\/python3/' {} \;
sed -i 's/!\/usr\/bin\/python/!\/usr\/bin\/python3/' %{buildroot}%{proton_datadir}/examples/c/testme sed -i 's/!\/usr\/bin\/python/!\/usr\/bin\/python3/' %{buildroot}%{proton_datadir}/examples/c/testme
@ -311,6 +316,9 @@ rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
%check %check
%changelog %changelog
* Wed Jul 29 2020 Irina Boverman <iboverma@redhat.com> - 0.30.0-5
- cmake changes
* Mon Jun 1 2020 Irina Boverman <iboverma@redhat.com> - 0.30.0-4 * Mon Jun 1 2020 Irina Boverman <iboverma@redhat.com> - 0.30.0-4
- Corrected cmake for c/cpp examples - Corrected cmake for c/cpp examples
- Resolved PROTON-2228 - Resolved PROTON-2228

Loading…
Cancel
Save