packages/qpid-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 Update to 0.31.0

Browse Source 
Merge pull request !3 from 雷炬/master
This commit is contained in:
openeuler-ci-bot 2020-06-03 11:13:18 +08:00 committed by Gitee
commit ea655ab264
4 changed files with 115 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
0.24.0.tar.gz
View File

Binary file not shown.

BIN
0.31.0.tar.gz Normal file
View File

Binary file not shown.

26
proton.patch Normal file
View File

@ -0,0 +1,26 @@
From e5522e87e2597ee9898cd9699c8c27bc6f8b12b1 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvdr@localhost.localdomain>
Date: Tue, 10 Dec 2019 10:56:30 -0500
Subject: [PATCH] Changed Sphinx invocation from sphinx to sphinx-build for
RHEL7
---
python/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 87057d8..9176ba5 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -127,7 +127,7 @@ else ()
COMMAND ${PN_ENV_SCRIPT} --
PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}
LD_LIBRARY_PATH="${CMAKE_CURRENT_BINARY_DIR}/c"
- ${PYTHON_EXECUTABLE} -m sphinx "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_BINARY_DIR}/docs")
+ sphinx-build "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_BINARY_DIR}/docs")
add_dependencies(docs docs-py)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docs/"
DESTINATION "${PROTON_SHARE}/docs/api-py"
--
1.8.3.1

221
qpid-proton.spec
View File

@ -1,226 +1,183 @@
%{?filter_setup: %{?filter_setup:
%filter_provides_in %{_datadir}/proton-%{version}/examples/ %filter_provides_in %{_datadir}/proton/examples/
%filter_requires_in %{_datadir}/proton-%{version}/examples/ %filter_requires_in %{_datadir}/proton/examples/
%filter_setup %filter_setup
} }
%global pythonx python2 %global proton_licensedir %{_licensedir}/proton
%{!?__python2:
%global __python2 %{__python}
%global python2_sitearch %{python_sitearch}
%global pythonx python
}
%global proton_licensedir %{_licensedir}/proton-%{version}
%{!?_licensedir: %{!?_licensedir:
%global license %doc %global license %doc
%global proton_licensedir %{_datadir}/proton-%{version} %global proton_licensedir %{_datadir}/proton}
}
Name: qpid-proton Name: qpid-proton
Version: 0.24.0 Version: 0.31.0
Release: 5 Release: 1
Summary: A high-performance and lightweight library for messaging applications Summary: A high performance and lightweight library for messaging applications
License: ASL 2.0 License: ASL 2.0
URL: http://qpid.apache.org/proton/ URL: http://qpid.apache.org/proton/
Source0: https://github.com/apache/qpid-proton/archive/0.24.0.tar.gz Source0: https://github.com/apache/qpid-proton/archive/0.31.0.tar.gz
BuildRequires: gcc-c++ cmake swig pkgconfig doxygen libuuid-devel Patch0000: proton.patch
BuildRequires: openssl-devel %{pythonx}-devel python3-devel epydoc
BuildRequires: glibc-headers cyrus-sasl-devel BuildRequires: gcc gcc-c++ cmake swig pkgconfig doxygen libuuid-devel openssl-devel
BuildRequires: python3-devel python3-sphinx glibc-headers cyrus-sasl-devel jsoncpp-devel
%description %description
qpid-proton is a high-performance, lightweight messaging library. It can be used Proton is a high performance, lightweight messaging library. It can be used in
in the widest range of messaging applications, including brokers, client libraries, the widest range of messaging applications including brokers, client libraries,
routers, bridges, proxies, and more. Proton makes it trivial to integrate with the routers, bridges, proxies, and more. Proton makes it trivial to integrate with
AMQP 1.0 ecosystem from any platform, environment, or language. the AMQP 1.0 ecosystem from any platform, environment, or language.
%package c-cpp %package c-cpp
Summary: C/C++ libs for qpid-proton Summary: C/C++ libs for qpid-proton
Requires: cyrus-sasl-lib Requires: cyrus-sasl-lib jsoncpp
Provides: qpid-proton-c = %{version}-%{release} qpid-proton-cpp = %{version}-%{release} Provides: qpid-proton-c = %{version}-%{release} qpid-proton-cpp = %{version}-%{release}
Obsoletes: qpid-proton perl-qpid-proton qpid-proton-c < %{version}-%{release} Obsoletes: qpid-proton perl-qpid-proton qpid-proton-c < %{version}-%{release}
Obsoletes: qpid-proton-cpp < %{version}-%{release} Obsoletes: qpid-proton-cpp < %{version}-%{release}
%description c-cpp %description c-cpp
This package contains C/C++ libraries for qpid-proton. This package contains C/C++ libraries for qpid-proton.
%package c-cpp-devel %package c-cpp-devel
Requires: qpid-proton-c-cpp = %{version}-%{release} Summary: Development C/C++ libs for qpid-proton
Summary: Development C/C++ libs for qpid-proton Requires: qpid-proton-c-cpp = %{version}-%{release}
Provides: qpid-proton-c-devel = %{version}-%{release} qpid-proton-cpp-devel = %{version}-%{release} Provides: qpid-proton-c-devel = %{version}-%{release} qpid-proton-cpp-devel = %{version}-%{release}
Obsoletes: qpid-proton-devel qpid-proton-c-devel < %{version}-%{release} Obsoletes: qpid-proton-devel qpid-proton-c-devel < %{version}-%{release}
Obsoletes: qpid-proton-cpp-devel < %{version}-%{release} Obsoletes: qpid-proton-cpp-devel < %{version}-%{release}
%description c-cpp-devel %description c-cpp-devel
This package contains development C/C++ libraries for writing messaging apps with qpid-proton. This package contains C/C++ development libraries for writing messaging apps with qpid-proton.
%package c-help %package c-help
Summary: Documentation for the C development libs Summary: Documentation for the C development libs
BuildArch: noarch BuildArch: noarch
Provides: c-docs = %{version}-%{release} Provides: c-docs = %{version}-%{release}
Obsoletes: qpid-proton-c-devel-doc qpid-proton-c-devel-docs c-docs < %{version}-%{release} Obsoletes: qpid-proton-c-devel-doc qpid-proton-c-devel-docs c-docs < %{version}-%{release}
%description c-help %description c-help
This package contains documentation for the C development libraries and examples for qpid-proton. This package contains documentation for the C development libraries and examples for qpid-proton.
%package cpp-help %package cpp-help
Summary: Documentation for the C++ development libs Summary: Documentation for the C++ development libs
BuildArch: noarch BuildArch: noarch
Provides: cpp-docs = %{version}-%{release} Provides: cpp-docs = %{version}-%{release}
Obsoletes: qpid-proton-cpp-devel-doc qpid-proton-cpp-devel-docs cpp-docs < %{version}-%{release} Obsoletes: qpid-proton-cpp-devel-doc qpid-proton-cpp-devel-docs cpp-docs < %{version}-%{release}
%description cpp-help %description cpp-help
This package contains documentation for the C++ development libraries for qpid-proton. This package contains documentation for the C++ development libraries and examples for qpid-proton.
%package -n %{pythonx}-qpid-proton
Summary: Python language bindings for qpid-proton
%python_provide python2-qpid-proton
Requires: qpid-proton-c = %{version}-%{release} %{pythonx}
%description -n %{pythonx}-qpid-proton
This package contains python language bindings for the qpid-proton messaging framework.
%package -n python3-qpid-proton %package -n python3-qpid-proton
Summary: Python language bindings for qpid-proton Summary: Python language bindings for the qpid-proton
%python_provide python3-qpid-proton %python_provide python3-qpid-proton
Requires: qpid-proton-c = %{version}-%{release} python3 Requires: qpid-proton-c = %{version}-%{release} python3
%description -n python3-qpid-proton %description -n python3-qpid-proton
This package contains python language bindings for the qpid-proton messaging framework. This package contains python language bindings for the qpid-proton messaging framework.
%package -n python-qpid-proton-help %package -n python-qpid-proton-help
Summary: Documentation for the Python language bindings for qpid-proton Summary: Documentation for the Python language bindings for qpid-proton
BuildArch: noarch BuildArch: noarch
Provides: python-qpid-proton-docs = %{version}-%{release} Provides: python-qpid-proton-docs = %{version}-%{release}
Obsoletes: python-qpid-proton-doc python-qpid-proton-docs < %{version}-%{release} Obsoletes: python-qpid-proton-doc python-qpid-proton-docs < %{version}-%{release}
%description -n python-qpid-proton-help %description -n python-qpid-proton-help
This package constains documentation for the Python language bindings for qpid-proton. This package contains documentation for the Python language bindings for qpid-proton.
%package tests
Summary: Tests for qpid-proton
BuildArch: noarch
%description tests
This package contains some tests for qpid-proton.
%prep %prep
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
%build %build
rm -rf buildpython2 && mkdir buildpython2
rm -rf buildpython3 && mkdir buildpython3 rm -rf buildpython3 && mkdir buildpython3
pushd buildpython2
%cmake \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,relro" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,-z,relro" -DSYSINSTALL_BINDINGS=ON \
-DCMAKE_SKIP_RPATH:BOOL=OFF -DENABLE_FUZZ_TESTING=NO \
..
export ADDCFLAGS=" -Wno-error=return-type"
%cmake \
-DSYSINSTALL_BINDINGS=ON -DCMAKE_SKIP_RPATH:BOOL=OFF \
-DENABLE_FUZZ_TESTING=NO "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS $ADDCFLAGS" \
-DCYRUS_SASL_INCLUDE_DIR=/usr/include -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7/ "-DPYTHON_LIBRARY=%{_libdir}/libpython2.7.so" \
..
make all docs -j1
(pushd python/dist; %py2_build)
pushd ..
pushd buildpython3 pushd buildpython3
python_includes=$(ls -d /usr/include/python3*) python_includes=$(ls -d /usr/include/python3*)
%cmake \ %cmake \
-DSYSINSTALL_BINDINGS=ON -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DSYSINSTALL_BINDINGS=ON \
-DENABLE_FUZZ_TESTING=NO "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS $ADDCFLAGS" \ -DCMAKE_SKIP_RPATH:BOOL=OFF \
-DCYRUS_SASL_INCLUDE_DIR=/usr/include -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DENABLE_FUZZ_TESTING=NO \
"-DPYTHON_INCLUDE_DIR=$python_includes" "-DPYTHON_LIBRARY=%{_libdir}/libpython3.so" \ "-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 make all docs -j1
(pushd python/dist; %py3_build) (pushd python/dist; %py3_build)
%install %install
pushd buildpython2 pushd buildpython3
%make_install
(pushd python/dist; %py2_install)
pushd ../buildpython3
%make_install %make_install
(pushd python/dist; %py3_install) (pushd python/dist; %py3_install)
chmod +x %{buildroot}%{python2_sitearch}/_cproton.so find %{buildroot}%{_datadir}/proton/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}%{_datadir}/proton/examples/c/testme
sed -i 's/!\/usr\/bin\/python/!\/usr\/bin\/python3/' %{buildroot}%{_datadir}/proton/examples/cpp/testme
echo '#!/usr/bin/python3' > %{buildroot}%{_datadir}/proton/examples/python/proton_server.py.original
cat %{buildroot}%{_datadir}/proton/examples/python/proton_server.py >> %{buildroot}%{_datadir}/proton/examples/python/proton_server.py.original
mv %{buildroot}%{_datadir}/proton/examples/python/proton_server.py.original %{buildroot}%{_datadir}/proton/examples/python/proton_server.py
chmod +x %{buildroot}%{python3_sitearch}/_cproton.so chmod +x %{buildroot}%{python3_sitearch}/_cproton.so
rm -fr %{buildroot}%{proton_datadir}/examples/**/*.cmake rm -fr %{buildroot}%{_datadir}/proton/examples/**/*.cmake
rm -fr %{buildroot}%{proton_datadir}/examples/go rm -f %{buildroot}%{_datadir}/proton/CMakeLists.txt
rm -fr %{buildroot}%{_datadir}/proton/examples/go
for fpath in %{buildroot}%{_libdir} %{buildroot}%{_datarootdir} \ for fpath in %{buildroot}%{_libdir} %{buildroot}%{_datarootdir} \
%{buildroot}%{proton_datadir}/examples %{buildroot}%{_datadir}/proton/examples
do do
rm -rf ${fpath}/ruby rm -rf ${fpath}/ruby
done done
%check %check
%post %post
/sbin/ldconfig /sbin/ldconfig
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%files c-cpp %files c-cpp
%dir %{_datadir}/proton-%{version} %dir %{_datadir}/proton
%license %{_datadir}/proton-%{version}/LICENSE.txt %license %{_datadir}/proton/LICENSE.txt
%doc %{_datadir}/proton-%{version}/README.md %doc %{_datadir}/proton/README*
%{_libdir}/libqpid-proton* %{_libdir}/libqpid-proton*
%files c-cpp-devel %files c-cpp-devel
%{_includedir}/proton %{_includedir}/proton
%{_libdir}/cmake/Proton %{_libdir}/cmake/Proton
%{_libdir}/cmake/ProtonCpp
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%{_libdir}/cmake/ProtonCpp
%files c-help %files c-help
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license %{_datadir}/proton-%{version}/LICENSE.txt %license %{_datadir}/proton/LICENSE.txt
%doc %{_datadir}/proton-%{version}/docs/api-c %doc %{_datadir}/proton/examples/README.md
%doc %{_datadir}/proton-%{version}/examples/c/* %doc %{_datadir}/proton/docs/api-c
%doc %{_datadir}/proton/examples/c/*
%files cpp-help %files cpp-help
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license %{_datadir}/proton-%{version}/LICENSE.txt %license %{_datadir}/proton/LICENSE.txt
%{_datadir}/proton-%{version}/docs/api-cpp %{_datadir}/proton/docs/api-cpp
%doc %{_datadir}/proton-%{version}/examples/cpp/* %doc %{_datadir}/proton/examples/cpp/*
%files -n %{pythonx}-qpid-proton
%defattr(-,root,root,-)
%license %{_datadir}/proton-%{version}/LICENSE.txt
%{python2_sitearch}/*
%files -n python3-qpid-proton %files -n python3-qpid-proton
%{python3_sitearch}/* %{python3_sitearch}/*
%files -n python-qpid-proton-help %files -n python-qpid-proton-help
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license %{_datadir}/proton-%{version}/LICENSE.txt %license %{_datadir}/proton/LICENSE.txt
%doc %{_datadir}/proton-%{version}/docs/api-py %doc %{_datadir}/proton/docs/api-py
%doc %{_datadir}/proton-%{version}/examples/python %doc %{_datadir}/proton/examples/python
%files tests
%license %{_datadir}/proton/LICENSE.txt
%doc %{_datadir}/proton/tests
%changelog %changelog
* Tue Jun 2 2020 leiju <leiju4@huawei.com> - 0.31.0-1
- Update to 0.31.0
* Wed Jan 8 2020 Senlin Xia<xiasenlin1@huawei.com> - 0.24.0-5 * Wed Jan 8 2020 Senlin Xia<xiasenlin1@huawei.com> - 0.24.0-5
- Package init - Package init