diff --git a/0001-Temporary-patch-to-enable-installed-examples-to-buil.patch b/0001-Temporary-patch-to-enable-installed-examples-to-buil.patch deleted file mode 100644 index d63c0f4..0000000 --- a/0001-Temporary-patch-to-enable-installed-examples-to-buil.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c575fbe6646fa37ed5759d0011ac7cd0d4cea22b Mon Sep 17 00:00:00 2001 -From: Andrew Stitcher -Date: Thu, 28 May 2020 12:34:58 -0400 -Subject: [PATCH] Temporary patch to enable installed examples to build. - ---- - c/examples/CMakeLists.txt | 22 ---------------------- - cpp/examples/CMakeLists.txt | 31 ------------------------------- - 2 files changed, 53 deletions(-) - -diff --git a/c/examples/CMakeLists.txt b/c/examples/CMakeLists.txt -index 9771ec59..1f448e9e 100644 ---- a/c/examples/CMakeLists.txt -+++ b/c/examples/CMakeLists.txt -@@ -32,25 +32,3 @@ foreach (name broker send receive direct send-abort send-ssl) - set_target_properties(c-${name} PROPERTIES - OUTPUT_NAME ${name}) - endforeach() -- -- --find_package (PythonInterp) # For test-driver script --if (PYTHON_EXECUTABLE) -- if(WIN32) -- # NOTE: need to escape semicolons as cmake uses them as list separators. -- set(test_path "$\;$\;$") -- else() -- set(test_path "$:$ENV{PATH}") -- endif() -- -- set(test_env -- "PATH=${test_path}" -- "PYTHONPATH=../../tests/py") -- -- pn_add_test( -- UNWRAPPED -- NAME c-example-tests -- PREPEND_ENVIRONMENT "${test_env}" -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- COMMAND ${PYTHON_EXECUTABLE} testme -v) --endif() -diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt -index 4c6dc9f4..74e41de4 100644 ---- a/cpp/examples/CMakeLists.txt -+++ b/cpp/examples/CMakeLists.txt -@@ -102,34 +102,3 @@ if(HAS_ENOUGH_CPP11) - endforeach() - endif() - endif() -- --find_package (PythonInterp) # For test-driver script --if (PYTHON_EXECUTABLE) -- if(WIN32) -- # NOTE: need to escape semicolons as cmake uses them as list separators. -- set(test_path "$\;$\;$") -- else() -- set(test_path "$:$ENV{PATH}") -- endif() -- -- set(test_env -- "PATH=${test_path}" -- "PYTHONPATH=../../tests/py" -- "HAS_CPP11=$<$:1>") -- -- pn_add_test( -- UNWRAPPED -- NAME cpp-example-container -- PREPEND_ENVIRONMENT "${test_env}" -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- COMMAND ${PYTHON_EXECUTABLE} testme -v ContainerExampleTest) -- -- if (NOT SSL_IMPL STREQUAL none) -- pn_add_test( -- UNWRAPPED -- NAME cpp-example-container-ssl -- PREPEND_ENVIRONMENT "${test_env}" -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- COMMAND ${PYTHON_EXECUTABLE} testme -v ContainerExampleSSLTest) -- endif() --endif() --- -2.26.2 - diff --git a/licenses.xml b/licenses.xml index cea4870..7a9da62 100644 --- a/licenses.xml +++ b/licenses.xml @@ -3,7 +3,7 @@ qpid-proton - 0.32.0 + 0.33.0 ASL 2.0 diff --git a/qpid-proton.spec b/qpid-proton.spec index 4a646bf..07dd352 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -13,15 +13,14 @@ } Name: qpid-proton -Version: 0.32.0 -Release: 3%{?dist} +Version: 0.33.0 +Release: 1%{?dist} Summary: A high performance, lightweight messaging library License: ASL 2.0 URL: http://qpid.apache.org/proton/ Source0: %{name}-%{version}.tar.gz Patch0: proton.patch -Patch1: 0001-Temporary-patch-to-enable-installed-examples-to-buil.patch Source1: licenses.xml @@ -87,8 +86,6 @@ Requires: jsoncpp %files cpp %dir %{proton_datadir} -%license %{proton_licensedir}/LICENSE.txt -%license %{proton_licensedir}/licenses.xml %doc %{proton_datadir}/README* %{_libdir}/libqpid-proton-cpp.so.* @@ -144,7 +141,6 @@ Obsoletes: qpid-proton-c-devel-docs %files c-docs %defattr(-,root,root,-) %license %{proton_licensedir}/LICENSE.txt -%license %{proton_licensedir}/licenses.xml %doc %{proton_datadir}/docs/api-c %doc %{proton_datadir}/examples/README.md %doc %{proton_datadir}/examples/c/ssl-certs @@ -152,7 +148,6 @@ Obsoletes: qpid-proton-c-devel-docs %doc %{proton_datadir}/examples/c/*.h %doc %{proton_datadir}/examples/c/README.dox %doc %{proton_datadir}/examples/c/CMakeLists.txt -%doc %{proton_datadir}/examples/c/testme* %package cpp-docs @@ -167,13 +162,11 @@ Obsoletes: qpid-proton-cpp-devel-docs %files cpp-docs %defattr(-,root,root,-) %license %{proton_licensedir}/LICENSE.txt -%license %{proton_licensedir}/licenses.xml %{proton_datadir}/docs/api-cpp %doc %{proton_datadir}/examples/cpp/*.cpp %doc %{proton_datadir}/examples/cpp/*.hpp %doc %{proton_datadir}/examples/cpp/README.dox %doc %{proton_datadir}/examples/cpp/CMakeLists.txt -%doc %{proton_datadir}/examples/cpp/testme* %doc %{proton_datadir}/examples/cpp/ssl-certs %doc %{proton_datadir}/examples/cpp/tutorial.dox @@ -203,7 +196,6 @@ Obsoletes: python-qpid-proton-doc %files -n python-qpid-proton-docs %defattr(-,root,root,-) %license %{proton_licensedir}/LICENSE.txt -%license %{proton_licensedir}/licenses.xml %doc %{proton_datadir}/docs/api-py %doc %{proton_datadir}/examples/python @@ -235,8 +227,6 @@ standard. %{gem_extdir_mri} %exclude %{gem_cache} %{gem_spec} -%doc %{gem_instdir}/LICENSE.txt -%doc %{gem_instdir}/licenses.xml %doc %{gem_instdir}/examples %doc %{gem_instdir}/tests @@ -244,7 +234,6 @@ standard. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 %build @@ -256,8 +245,6 @@ python_includes=$(ls -d /usr/include/python3*) -DSYSINSTALL_BINDINGS=ON \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DENABLE_FUZZ_TESTING=NO \ - "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS -Wno-error=format" \ - "-DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS $CXXFLAGS" \ .. #make all docs %{?_smp_mflags} make all docs -j1 @@ -271,8 +258,6 @@ cd buildpython3 %make_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/' {} \; -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/cpp/testme echo '#!/usr/bin/python3' > %{buildroot}%{proton_datadir}/examples/python/proton_server.py.original cat %{buildroot}%{proton_datadir}/examples/python/proton_server.py >> %{buildroot}%{proton_datadir}/examples/python/proton_server.py.original mv %{buildroot}%{proton_datadir}/examples/python/proton_server.py.original %{buildroot}%{proton_datadir}/examples/python/proton_server.py @@ -288,7 +273,7 @@ cd ruby/gem/ mkdir -p %{buildroot}%{gem_instdir} install -dm 755 %{buildroot}%{gem_dir}/specifications mkdir -p %{buildroot}%{gem_extdir_mri} -cp -a ../cproton.so %{buildroot}%{gem_extdir_mri}/ +cp -a %{buildroot}%{ruby_vendorarchdir}/cproton.so %{buildroot}%{gem_extdir_mri}/ touch %{buildroot}%{gem_extdir_mri}/gem.build_complete chmod 644 %{buildroot}%{gem_extdir_mri}/gem.build_complete cp -a examples tests lib %{buildroot}%{gem_instdir}/ @@ -357,6 +342,9 @@ rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt %check %changelog +* Tue Jan 19 2021 Irina Boverman - 0.33.0-1 +- Rebased to 0.33.0 + * Wed Jan 06 2021 Mamoru TASAKA - 0.32.0-3 - F-34: rebuild against ruby 3.0 diff --git a/sources b/sources index f1f7391..ba9e263 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qpid-proton-0.32.0.tar.gz) = 4d1265308b685d5cdd28fd8746f13704c6e36a8dc35a2c121e07b9db21cabaf440da8dd1cf76892fc366845e7f472af2c29ae94dedee19d53756bba2bd4470b6 +SHA512 (qpid-proton-0.33.0.tar.gz) = d82cade354fd01f2cf7a3e0c17d48cdfa3bde263c8571762cdeb0b4da6ef2d6fd6f97cdba4fa4e8fc1b5368c54ccd2ca860fb56f46f58091c91deab843a17cf2