From b74f6c1ced47268e094f035a539e663f593af17d Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Wed, 14 Mar 2018 10:10:46 -0400 Subject: [PATCH 1/9] 0.21.0-2 --- qpid-proton.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index d499bb8..e02979a 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -21,7 +21,7 @@ Name: qpid-proton Version: 0.21.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries Summary: A high performance, lightweight messaging library License: ASL 2.0 @@ -396,6 +396,9 @@ popd %endif %changelog +* Wed Mar 14 2018 Irina Boverman - 0.21.0-2 +- Updated per changes on master + * Tue Mar 13 2018 Irina Boverman - 0.21.0-1 - Rebased to 0.21.0 From 07f8490e14d28a5908d70a95d38b49dd52623a4c Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 14:35:11 -0400 Subject: [PATCH 2/9] 0.24.0-1 --- .gitignore | 1 + licenses.xml | 2 +- qpid-proton.spec | 34 +++++++++++++++++++--------------- sources | 2 +- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 670d495..d4c4102 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /qpid-proton-0.17.0.tar.gz /qpid-proton-0.18.1.tar.gz /qpid-proton-0.21.0.tar.gz +/qpid-proton-0.24.0.tar.gz diff --git a/licenses.xml b/licenses.xml index bd9caed..f922f65 100644 --- a/licenses.xml +++ b/licenses.xml @@ -3,7 +3,7 @@ qpid-proton - 0.21.0 + 0.24.0 ASL 2.0 diff --git a/qpid-proton.spec b/qpid-proton.spec index e02979a..014160c 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -1,5 +1,4 @@ %global proton_datadir %{_datadir}/proton-%{version} -%global gem_name qpid_proton # per https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Preventing_files.2Fdirectories_from_being_scanned_for_deps_.28pre-scan_filtering.29 %global __provides_exclude_from ^%{proton_datadir}/examples/.*$ @@ -20,8 +19,8 @@ %{!?__python2:%global pythonx python} Name: qpid-proton -Version: 0.21.0 -Release: 2%{?dist} +Version: 0.24.0 +Release: 1%{?dist} Group: System Environment/Libraries Summary: A high performance, lightweight messaging library License: ASL 2.0 @@ -80,7 +79,7 @@ Obsoletes: qpid-proton %files c %defattr(-,root,root,-) %dir %{proton_datadir} -%license %{proton_licensedir}/LICENSE +%license %{proton_licensedir}/LICENSE.txt %license %{proton_licensedir}/licenses.xml %doc %{proton_datadir}/README* %{_libdir}/libqpid-proton.so.* @@ -103,7 +102,7 @@ Requires: qpid-proton-c%{?_isa} = %{version}-%{release} %files cpp %defattr(-,root,root,-) %dir %{proton_datadir} -%license %{proton_licensedir}/LICENSE +%license %{proton_licensedir}/LICENSE.txt %license %{proton_licensedir}/licenses.xml %doc %{proton_datadir}/README* %{_libdir}/libqpid-proton-cpp.so.* @@ -165,10 +164,10 @@ Obsoletes: qpid-proton-c-devel-docs %files c-docs %defattr(-,root,root,-) -%license %{proton_licensedir}/LICENSE +%license %{proton_licensedir}/LICENSE.txt %license %{proton_licensedir}/licenses.xml %doc %{proton_datadir}/docs/api-c -%doc %{proton_datadir}/examples/c/ssl_certs +%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 @@ -187,7 +186,7 @@ Obsoletes: qpid-proton-cpp-devel-docs %files cpp-docs %defattr(-,root,root,-) -%license %{proton_licensedir}/LICENSE +%license %{proton_licensedir}/LICENSE.txt %license %{proton_licensedir}/licenses.xml %{proton_datadir}/docs/api-cpp %doc %{proton_datadir}/examples/cpp/*.cpp @@ -195,7 +194,7 @@ Obsoletes: qpid-proton-cpp-devel-docs %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/ssl_certs +%doc %{proton_datadir}/examples/cpp/ssl-certs %doc %{proton_datadir}/examples/cpp/tutorial.dox @@ -214,7 +213,7 @@ Requires: %{pythonx} %files -n %{pythonx}-qpid-proton %defattr(-,root,root,-) -%license %{proton_licensedir}/LICENSE +%license %{proton_licensedir}/LICENSE.txt %license %{proton_licensedir}/licenses.xml %{python2_sitearch}/* @@ -247,7 +246,7 @@ Obsoletes: python-qpid-proton-doc %files -n python-qpid-proton-docs %defattr(-,root,root,-) -%license %{proton_licensedir}/LICENSE +%license %{proton_licensedir}/LICENSE.txt %license %{proton_licensedir}/licenses.xml %doc %{proton_datadir}/docs/api-py %doc %{proton_datadir}/examples/python @@ -263,7 +262,7 @@ Requires: qpid-proton-c = %{version}-%{release} %{summary}. %files -n perl-qpid-proton -%doc LICENSE README* +%doc LICENSE.txt README* %{perl_vendorarch}/* %endif @@ -282,7 +281,7 @@ export ADDCXXFLAGS=" -Wno-error=format-security -Wno-error=catch-value=" -DSYSINSTALL_PERL=1 \ -DSYSINSTALL_BINDINGS=ON \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ - "-DCMAKE_CXX_FLAGS=$CXXFLAGS $ADDCXXFLAGS" \ + -DENABLE_FUZZ_TESTING=NO \ . %endif %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -293,6 +292,7 @@ export ADDCXXFLAGS=" -Wno-error=format-security -Wno-error=catch-value=" -DSYSINSTALL_BINDINGS=ON \ -DBUILD_PERL=OFF \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DENABLE_FUZZ_TESTING=NO \ . %endif @@ -319,8 +319,8 @@ install -pm 644 %{SOURCE1} %{buildroot}%{proton_datadir}/ %else install -dm 755 %{buildroot}%{proton_licensedir} install -pm 644 %{SOURCE1} %{buildroot}%{proton_licensedir} -install -pm 644 %{buildroot}%{proton_datadir}/LICENSE %{buildroot}%{proton_licensedir} -rm -f %{buildroot}%{proton_datadir}/LICENSE +install -pm 644 %{buildroot}%{proton_datadir}/LICENSE.txt %{buildroot}%{proton_licensedir} +rm -f %{buildroot}%{proton_datadir}/LICENSE.txt %endif # clean up files that are not shipped @@ -369,6 +369,7 @@ rm -f %{buildroot}%{proton_datadir}/examples/cpp/selected_recv rm -f %{buildroot}%{proton_datadir}/examples/cpp/server rm -f %{buildroot}%{proton_datadir}/examples/cpp/server_direct rm -f %{buildroot}%{proton_datadir}/examples/cpp/service_bus +rm -f %{buildroot}%{proton_datadir}/examples/cpp/simple_connect rm -f %{buildroot}%{proton_datadir}/examples/cpp/simple_recv rm -f %{buildroot}%{proton_datadir}/examples/cpp/simple_send rm -f %{buildroot}%{proton_datadir}/examples/cpp/ssl @@ -396,6 +397,9 @@ popd %endif %changelog +* Tue Jul 10 2018 Irina Boverman - 0.24.0-1 +- Rebased to 0.24.0 + * Wed Mar 14 2018 Irina Boverman - 0.21.0-2 - Updated per changes on master diff --git a/sources b/sources index 94cf577..98a0201 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qpid-proton-0.21.0.tar.gz) = 81facd2d6dc690a5b5d8ed2278177396dba1f4d0868421b05870c4492953762f563a39a6160ab2aee378596e327f27864fc15bbfddfb1e5efdc4a4066610f84d +SHA512 (qpid-proton-0.24.0.tar.gz) = a93e7880b59df567c706ffda9420d752c58a91e244d52d50dd669eb30aca61f8a9a5efa4b9100d4d4499f701dc7d4b60f7ab575f6ee43f2c0611b58cbc66ceeb From 1d06c58a219532f3ca2ce08c9fefd312d33f5a33 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 15:36:26 -0400 Subject: [PATCH 3/9] 0.24.0-1 --- qpid-proton.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index 014160c..bf096ff 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -275,13 +275,14 @@ Requires: qpid-proton-c = %{version}-%{release} %build %if 0%{?fedora} -export ADDCXXFLAGS=" -Wno-error=format-security -Wno-error=catch-value=" +export ADDCXXFLAGS=" -Wno-error=return-type" %cmake \ -DSYSINSTALL_PYTHON=1 \ -DSYSINSTALL_PERL=1 \ -DSYSINSTALL_BINDINGS=ON \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DENABLE_FUZZ_TESTING=NO \ + "-DCMAKE_CXX_FLAGS=$CXXFLAGS $ADDCXXFLAGS" \ . %endif %if 0%{?rhel} && 0%{?rhel} <= 7 From ce5c53549402bf2075dd998f166b13ff00661d65 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 15:56:49 -0400 Subject: [PATCH 4/9] 0.24.0-1 --- qpid-proton.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index bf096ff..bc35eff 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -299,7 +299,7 @@ export ADDCXXFLAGS=" -Wno-error=return-type" make all docs %{?_smp_mflags} %if 0%{?fedora} || 0%{?rhel} > 7 -(cd proton-c/bindings/python/dist; %py3_build) +(cd python/dist; %py3_build) %endif %install @@ -307,7 +307,7 @@ rm -rf %{buildroot} %make_install %if 0%{?fedora} || 0%{?rhel} > 7 -(cd proton-c/bindings/python/dist; %py3_install) +(cd python/dist; %py3_install) %endif CPROTON_BUILD=$PWD . ./config.sh From d81ef50a8698b77b4a75c84f2006c6bdca72a993 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Fri, 27 Jul 2018 16:53:56 -0400 Subject: [PATCH 5/9] 0.24.0-1 --- qpid-proton.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index a3f78d3..d586881 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -312,7 +312,7 @@ cd ../buildpython3 #CPROTON_BUILD=$PWD . ./config.sh chmod +x %{buildroot}%{python2_sitearch}/_cproton.so -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} && 0%{?fedora} < 29 chmod +x %{buildroot}%{python3_sitearch}/_cproton.so %endif #find %{buildroot}%{proton_datadir}/examples/ -type f | xargs chmod -x From 74eeec61777ce0f407fa30224f1d7c818500ac03 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Fri, 27 Jul 2018 22:14:38 -0400 Subject: [PATCH 6/9] 0.24.0-1 --- qpid-proton.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index d586881..9c09fd3 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -312,7 +312,7 @@ cd ../buildpython3 #CPROTON_BUILD=$PWD . ./config.sh chmod +x %{buildroot}%{python2_sitearch}/_cproton.so -%if 0%{?fedora} && 0%{?fedora} < 29 +%if 0%{?fedora} && 0%{?fedora} >= 29 chmod +x %{buildroot}%{python3_sitearch}/_cproton.so %endif #find %{buildroot}%{proton_datadir}/examples/ -type f | xargs chmod -x From 71193dcf86aaba4969d1c14c1cb86db051939b03 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 31 Jul 2018 10:48:58 -0400 Subject: [PATCH 7/9] 0.24.0-2 --- qpid-proton.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index 9c09fd3..691eac5 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -20,7 +20,7 @@ Name: qpid-proton Version: 0.24.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries Summary: A high performance, lightweight messaging library License: ASL 2.0 @@ -312,7 +312,7 @@ cd ../buildpython3 #CPROTON_BUILD=$PWD . ./config.sh chmod +x %{buildroot}%{python2_sitearch}/_cproton.so -%if 0%{?fedora} && 0%{?fedora} >= 29 +%if 0%{?fedora} || 0%{?rhel} > 7 chmod +x %{buildroot}%{python3_sitearch}/_cproton.so %endif #find %{buildroot}%{proton_datadir}/examples/ -type f | xargs chmod -x @@ -394,6 +394,9 @@ rm -fr %{buildroot}%{proton_datadir}/examples/php %check %changelog +* Tue Jul 31 2018 Irina Boverman - 0.24.0-2 +- Updated spec for %{python3_sitearch}/_cproton.so + * Fri Jul 27 2018 Irina Boverman - 0.24.0-1 - Rebased to 0.24.0 From c852fb7c4d7d9fc27b17092353aef749298db5d4 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 31 Jul 2018 11:22:02 -0400 Subject: [PATCH 8/9] 0.24.0-2 --- qpid-proton.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qpid-proton.spec b/qpid-proton.spec index 691eac5..16d066c 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -289,6 +289,9 @@ cd buildpython3 -DENABLE_FUZZ_TESTING=NO \ "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS $ADDCFLAGS" \ -DCYRUS_SASL_INCLUDE_DIR=/usr/include \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_INCLUDE_DIR=/usr/include/python3/ \ + "-DPYTHON_LIBRARY=%{_libdir}/libpython3.so" \ .. #make all docs %{?_smp_mflags} make all docs -j1 From cf8eb83ef3f338394c1a1d39f2d6c147ab240a0d Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 31 Jul 2018 14:25:39 -0400 Subject: [PATCH 9/9] 0.24.0-2 --- qpid-proton.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index 16d066c..c6033ab 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -283,6 +283,7 @@ make all docs -j1 cd .. mkdir buildpython3 cd buildpython3 +python_includes=$(ls -d /usr/include/python3*) %cmake \ -DSYSINSTALL_BINDINGS=ON \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ @@ -290,7 +291,7 @@ cd buildpython3 "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS $ADDCFLAGS" \ -DCYRUS_SASL_INCLUDE_DIR=/usr/include \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3/ \ + "-DPYTHON_INCLUDE_DIR=$python_includes" \ "-DPYTHON_LIBRARY=%{_libdir}/libpython3.so" \ .. #make all docs %{?_smp_mflags}