diff --git a/.gitignore b/.gitignore index d4c4102..1c562db 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /qpid-proton-0.18.1.tar.gz /qpid-proton-0.21.0.tar.gz /qpid-proton-0.24.0.tar.gz +/qpid-proton-0.26.0.tar.gz diff --git a/licenses.xml b/licenses.xml index f922f65..739e792 100644 --- a/licenses.xml +++ b/licenses.xml @@ -3,7 +3,7 @@ qpid-proton - 0.24.0 + 0.26.0 ASL 2.0 diff --git a/proton.patch b/proton.patch new file mode 100644 index 0000000..39444ea --- /dev/null +++ b/proton.patch @@ -0,0 +1,55 @@ +From 133a1c350c949c5f997706c1b7f71e24559b6718 Mon Sep 17 00:00:00 2001 +From: vagrant +Date: Thu, 29 Nov 2018 22:34:01 +0000 +Subject: [PATCH] PROTON-1974: Correctly detect libraries with earlier versions + of CMake +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Patch-from: Jiri Daněk +--- + tools/cmake/Modules/FindCyrusSASL.cmake | 1 + + tools/cmake/Modules/FindJsonCpp.cmake | 1 + + tools/cmake/Modules/FindLibuv.cmake | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/tools/cmake/Modules/FindCyrusSASL.cmake b/tools/cmake/Modules/FindCyrusSASL.cmake +index ebd0eab..eeb3dbf 100644 +--- a/tools/cmake/Modules/FindCyrusSASL.cmake ++++ b/tools/cmake/Modules/FindCyrusSASL.cmake +@@ -47,6 +47,7 @@ set (CyrusSASL_VERSION ${PC_CyrusSASL_VERSION}) + + include (FindPackageHandleStandardArgs) + find_package_handle_standard_args (CyrusSASL ++ FOUND_VAR CyrusSASL_FOUND + REQUIRED_VARS CyrusSASL_LIBRARY CyrusSASL_INCLUDE_DIR + VERSION_VAR CyrusSASL_VERSION + ) +diff --git a/tools/cmake/Modules/FindJsonCpp.cmake b/tools/cmake/Modules/FindJsonCpp.cmake +index 083d3fc..242718d 100644 +--- a/tools/cmake/Modules/FindJsonCpp.cmake ++++ b/tools/cmake/Modules/FindJsonCpp.cmake +@@ -49,6 +49,7 @@ set(JsonCpp_VERSION ${PC_JsonCpp_VERSION}) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(JsonCpp ++ FOUND_VAR JsonCpp_FOUND + REQUIRED_VARS JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR + VERSION_VAR JsonCpp_VERSION) + +diff --git a/tools/cmake/Modules/FindLibuv.cmake b/tools/cmake/Modules/FindLibuv.cmake +index 422e124..e38cfaf 100644 +--- a/tools/cmake/Modules/FindLibuv.cmake ++++ b/tools/cmake/Modules/FindLibuv.cmake +@@ -49,6 +49,7 @@ set(Libuv_VERSION ${PC_Libuv_VERSION}) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Libuv ++ FOUND_VAR Libuv_FOUND + REQUIRED_VARS Libuv_LIBRARY Libuv_INCLUDE_DIR + VERSION_VAR Libuv_VERSION) + +-- +1.8.3.1 + diff --git a/qpid-proton.spec b/qpid-proton.spec index adb5a78..88080ab 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -19,15 +19,15 @@ %{!?__python2:%global pythonx python} Name: qpid-proton -Version: 0.24.0 -Release: 4%{?dist} +Version: 0.26.0 +Release: 1%{?dist} Group: System Environment/Libraries 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 +Patch0: proton.patch Source1: licenses.xml @@ -52,6 +52,7 @@ BuildRequires: epydoc BuildRequires: glibc-headers %endif BuildRequires: cyrus-sasl-devel +BuildRequires: jsoncpp-devel %description Proton is a high performance, lightweight messaging library. It can be used in @@ -90,6 +91,7 @@ Obsoletes: perl-qpid-proton Group: System Environment/Libraries Summary: C++ libraries for Qpid Proton Requires: qpid-proton-c%{?_isa} = %{version}-%{release} +Requires: jsoncpp %description cpp %{summary}. @@ -159,12 +161,13 @@ Obsoletes: qpid-proton-c-devel-docs %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 %doc %{proton_datadir}/examples/c/*.c %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/example_test.py* +%doc %{proton_datadir}/examples/c/testme* %package cpp-docs @@ -185,10 +188,11 @@ Obsoletes: qpid-proton-cpp-devel-docs %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/example_test.py* +%doc %{proton_datadir}/examples/cpp/testme* %doc %{proton_datadir}/examples/cpp/ssl-certs %doc %{proton_datadir}/examples/cpp/tutorial.dox + %package -n %{pythonx}-qpid-proton %{?python_provide:%python_provide python2-qpid-proton} Group: System Environment/Libraries @@ -240,9 +244,19 @@ Obsoletes: python-qpid-proton-doc %doc %{proton_datadir}/examples/python +%package tests +Group: Documentation +Summary: Qpid Proton Tests +BuildArch: noarch +%description tests +%{summary}. + +%files tests +%doc %{proton_datadir}/tests + %prep %setup -q -n %{name}-%{version} -#%patch0 -p1 +%patch0 -p1 %build @@ -398,6 +412,9 @@ rm -fr %{buildroot}%{proton_datadir}/examples/php %check %changelog +* Mon Jan 7 2019 Irina Boverman - 0.26.0-1 +- Rebased to 0.26.0 + * Tue Jul 31 2018 Irina Boverman - 0.24.0-4 - Added cmake arguments for python3 build diff --git a/sources b/sources index 98a0201..93dc83b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qpid-proton-0.24.0.tar.gz) = a93e7880b59df567c706ffda9420d752c58a91e244d52d50dd669eb30aca61f8a9a5efa4b9100d4d4499f701dc7d4b60f7ab575f6ee43f2c0611b58cbc66ceeb +SHA512 (qpid-proton-0.26.0.tar.gz) = e7c028aa4cabb0925c9e6f648a9c9fcfcbb66102aa4e1a82aa801153491db211c5154f95d21928a9c80cb5ef18f0038df0036fbb880ea6083f1b8cc91bd1e888