From 72c9c6b8075facb2b9266902e5a2d08111c4f3bc Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Thu, 15 Mar 2018 16:38:04 -0400 Subject: [PATCH 01/17] Changed python provides --- qpid-proton.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index d499bb8..0002744 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -200,9 +200,7 @@ Obsoletes: qpid-proton-cpp-devel-docs %package -n %{pythonx}-qpid-proton -%if 0%{fedora} || 0%{?rhel} > 7 %{?python_provide:%python_provide python2-qpid-proton} -%endif Group: System Environment/Libraries Summary: Python language bindings for the Qpid Proton messaging framework From 4b7db640ddcc3d46ad6f5546b0db9aba712f7acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:26:19 +0200 Subject: [PATCH 02/17] Rebuilt for Python 3.7 --- qpid-proton.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index 0002744..1dd3288 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 @@ -394,6 +394,9 @@ popd %endif %changelog +* Tue Jun 19 2018 Miro Hrončok - 0.21.0-2 +- Rebuilt for Python 3.7 + * Tue Mar 13 2018 Irina Boverman - 0.21.0-1 - Rebased to 0.21.0 From 13548bb65d894998a5ef3163878044680786fbe1 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 28 Jun 2018 07:14:50 +0200 Subject: [PATCH 03/17] Perl 5.28 rebuild --- qpid-proton.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index 1dd3288..b1383da 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -21,7 +21,7 @@ Name: qpid-proton Version: 0.21.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries Summary: A high performance, lightweight messaging library License: ASL 2.0 @@ -394,6 +394,9 @@ popd %endif %changelog +* Thu Jun 28 2018 Jitka Plesnikova - 0.21.0-3 +- Perl 5.28 rebuild + * Tue Jun 19 2018 Miro Hrončok - 0.21.0-2 - Rebuilt for Python 3.7 From 23056934de653ec172b3bf077e300a01ae5a3fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 3 Jul 2018 12:42:45 +0200 Subject: [PATCH 04/17] Perl 5.28 rebuild --- qpid-proton.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index b1383da..0413eb5 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -21,7 +21,7 @@ Name: qpid-proton Version: 0.21.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: System Environment/Libraries Summary: A high performance, lightweight messaging library License: ASL 2.0 @@ -394,6 +394,9 @@ popd %endif %changelog +* Tue Jul 03 2018 Petr Pisar - 0.21.0-4 +- Perl 5.28 rebuild + * Thu Jun 28 2018 Jitka Plesnikova - 0.21.0-3 - Perl 5.28 rebuild From 41a50f6ad6676843430f7ee394659adc3a4d1d4d Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:30:21 -0500 Subject: [PATCH 05/17] Remove needless use of %defattr --- qpid-proton.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index 0413eb5..386400d 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -78,7 +78,6 @@ Obsoletes: qpid-proton %files c -%defattr(-,root,root,-) %dir %{proton_datadir} %license %{proton_licensedir}/LICENSE %license %{proton_licensedir}/licenses.xml @@ -101,7 +100,6 @@ Requires: qpid-proton-c%{?_isa} = %{version}-%{release} %{summary}. %files cpp -%defattr(-,root,root,-) %dir %{proton_datadir} %license %{proton_licensedir}/LICENSE %license %{proton_licensedir}/licenses.xml @@ -123,7 +121,6 @@ Obsoletes: qpid-proton-devel %{summary}. %files c-devel -%defattr(-,root,root,-) %{_includedir}/proton %exclude %{_includedir}/proton/*.hpp %exclude %{_includedir}/proton/**/*.hpp @@ -146,7 +143,6 @@ Summary: Development libraries for writing messaging apps with Qpid Proton %{summary}. %files cpp-devel -%defattr(-,root,root,-) %{_includedir}/proton/*.hpp %{_includedir}/proton/**/*.hpp %{_libdir}/pkgconfig/libqpid-proton-cpp.pc @@ -164,7 +160,6 @@ Obsoletes: qpid-proton-c-devel-docs %{summary}. %files c-docs -%defattr(-,root,root,-) %license %{proton_licensedir}/LICENSE %license %{proton_licensedir}/licenses.xml %doc %{proton_datadir}/docs/api-c @@ -186,7 +181,6 @@ Obsoletes: qpid-proton-cpp-devel-docs %{summary}. %files cpp-docs -%defattr(-,root,root,-) %license %{proton_licensedir}/LICENSE %license %{proton_licensedir}/licenses.xml %{proton_datadir}/docs/api-cpp @@ -211,7 +205,6 @@ Requires: %{pythonx} %{summary}. %files -n %{pythonx}-qpid-proton -%defattr(-,root,root,-) %license %{proton_licensedir}/LICENSE %license %{proton_licensedir}/licenses.xml %{python2_sitearch}/* @@ -230,7 +223,6 @@ Requires: python3 %{summary}. %files -n python3-qpid-proton -%defattr(-,root,root,-) %{python3_sitearch}/* %endif @@ -244,7 +236,6 @@ Obsoletes: python-qpid-proton-doc %{summary}. %files -n python-qpid-proton-docs -%defattr(-,root,root,-) %license %{proton_licensedir}/LICENSE %license %{proton_licensedir}/licenses.xml %doc %{proton_datadir}/docs/api-py From 30e18213e26472fa9dd7210780c3b6c4bc28e044 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 14:35:11 -0400 Subject: [PATCH 06/17] 0.24.0-1 --- .gitignore | 1 + licenses.xml | 2 +- qpid-proton.spec | 32 ++++++++++++++++++-------------- sources | 2 +- 4 files changed, 21 insertions(+), 16 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 0002744..c1e8333 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,7 +19,7 @@ %{!?__python2:%global pythonx python} Name: qpid-proton -Version: 0.21.0 +Version: 0.24.0 Release: 1%{?dist} Group: System Environment/Libraries Summary: A high performance, lightweight messaging library @@ -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 @@ -212,7 +211,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}/* @@ -245,7 +244,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 @@ -261,7 +260,7 @@ Requires: qpid-proton-c = %{version}-%{release} %{summary}. %files -n perl-qpid-proton -%doc LICENSE README* +%doc LICENSE.txt README* %{perl_vendorarch}/* %endif @@ -280,7 +279,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 @@ -291,6 +290,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 @@ -317,8 +317,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 @@ -367,6 +367,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 @@ -394,6 +395,9 @@ popd %endif %changelog +* Tue Jul 10 2018 Irina Boverman - 0.24.0-1 +- Rebased to 0.24.0 + * Tue Mar 13 2018 Irina Boverman - 0.21.0-1 - Rebased to 0.21.0 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 04b7fda7072ee946d757ca9801f1accfbd81e040 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 15:56:49 -0400 Subject: [PATCH 07/17] 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 5f05ac4..ac9a63a 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -291,7 +291,7 @@ export ADDCXXFLAGS=" -Wno-error=format-security -Wno-error=catch-value=" 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 @@ -299,7 +299,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 82c077eb8c306a9c7fc45574d318603b346a6c14 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 16:30:53 -0400 Subject: [PATCH 08/17] 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 ac9a63a..84495c0 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -304,7 +304,7 @@ rm -rf %{buildroot} CPROTON_BUILD=$PWD . ./config.sh -chmod +x %{buildroot}%{python_sitearch}/_cproton.so +#chmod +x %{buildroot}%{python_sitearch}/_cproton.so #find %{buildroot}%{proton_datadir}/examples/ -type f | xargs chmod -x %if 0%{?rhel} && 0%{?rhel} <= 6 From cde02237320a36beba843284bd370a2cd401c9be Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 15:36:26 -0400 Subject: [PATCH 09/17] 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 84495c0..883f597 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -268,13 +268,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 4f752a34e5381cef43d39834c7658879b93a9ae6 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 17:24:26 -0400 Subject: [PATCH 10/17] 0.24.0-1 --- qpid-proton.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qpid-proton.spec b/qpid-proton.spec index 883f597..446d882 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -57,6 +57,8 @@ BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) %endif BuildRequires: cyrus-sasl-devel +BuildRequires: cyrus-sasl-plain +BuildRequires: cyrus-sasl-md5 %description Proton is a high performance, lightweight messaging library. It can be used in From d3e687445fa8f5d5256ee4d5ff010cc8863f4871 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 17:48:40 -0400 Subject: [PATCH 11/17] 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 446d882..40b749c 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -270,14 +270,14 @@ Requires: qpid-proton-c = %{version}-%{release} %build %if 0%{?fedora} -export ADDCXXFLAGS=" -Wno-error=return-type" +export ADDCFLAGS=" -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" \ + "-DCMAKE_C_FLAGS=$CFLAGS $ADDCFLAGS" \ . %endif %if 0%{?rhel} && 0%{?rhel} <= 7 From 5c08552fe88df60bb462a571ffdc923016ff965f Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 10 Jul 2018 17:58:36 -0400 Subject: [PATCH 12/17] 0.24.0-1 --- qpid-proton.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qpid-proton.spec b/qpid-proton.spec index 40b749c..fa00c99 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -59,6 +59,7 @@ BuildRequires: perl(Test::More) BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-plain BuildRequires: cyrus-sasl-md5 +BuildRequires: cyrus-sasl-gssapi %description Proton is a high performance, lightweight messaging library. It can be used in From 004d3d8cd2b13bcbff9ae791c2c526e1cacfe60e Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Wed, 11 Jul 2018 11:12:29 -0400 Subject: [PATCH 13/17] 0.24.0-1 --- qpid-proton.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index fa00c99..e720dcf 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -57,9 +57,6 @@ BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) %endif BuildRequires: cyrus-sasl-devel -BuildRequires: cyrus-sasl-plain -BuildRequires: cyrus-sasl-md5 -BuildRequires: cyrus-sasl-gssapi %description Proton is a high performance, lightweight messaging library. It can be used in @@ -273,12 +270,11 @@ Requires: qpid-proton-c = %{version}-%{release} %if 0%{?fedora} export ADDCFLAGS=" -Wno-error=return-type" %cmake \ - -DSYSINSTALL_PYTHON=1 \ - -DSYSINSTALL_PERL=1 \ -DSYSINSTALL_BINDINGS=ON \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DENABLE_FUZZ_TESTING=NO \ - "-DCMAKE_C_FLAGS=$CFLAGS $ADDCFLAGS" \ + "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS $ADDCFLAGS" \ + -DCYRUS_SASL_INCLUDE_DIR=/usr/include \ . %endif %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -287,7 +283,6 @@ export ADDCFLAGS=" -Wno-error=return-type" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,relro" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,-z,relro" \ -DSYSINSTALL_BINDINGS=ON \ - -DBUILD_PERL=OFF \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DENABLE_FUZZ_TESTING=NO \ . From b56310d679596fd0f28926851032ea3cd02201da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:04:18 +0000 Subject: [PATCH 14/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qpid-proton.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index e720dcf..b86d2a8 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 @@ -389,6 +389,9 @@ popd %endif %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.24.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 10 2018 Irina Boverman - 0.24.0-1 - Rebased to 0.24.0 From 965bde20e1c15c7f999cb9a3a2d2e27564f7792b Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 24 Jul 2018 10:49:36 -0400 Subject: [PATCH 15/17] 0.24.0-1 --- qpid-proton.spec | 40 +++++++--------------------------------- 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index b86d2a8..88f62bb 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -20,7 +20,7 @@ Name: qpid-proton Version: 0.24.0 -Release: 2%{?dist} +Release: 1%{?dist} Group: System Environment/Libraries Summary: A high performance, lightweight messaging library License: ASL 2.0 @@ -49,12 +49,7 @@ BuildRequires: python3-devel %endif BuildRequires: epydoc %if 0%{?fedora} -BuildRequires: perl-devel -BuildRequires: perl-generators BuildRequires: glibc-headers -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::Exception) -BuildRequires: perl(Test::More) %endif BuildRequires: cyrus-sasl-devel @@ -71,6 +66,7 @@ Group: System Environment/Libraries Summary: C libraries for Qpid Proton Requires: cyrus-sasl-lib Obsoletes: qpid-proton +Obsoletes: perl-qpid-proton %description c %{summary}. @@ -193,7 +189,7 @@ Obsoletes: qpid-proton-cpp-devel-docs %doc %{proton_datadir}/examples/cpp/ssl-certs %doc %{proton_datadir}/examples/cpp/tutorial.dox - +%if 0%{?rhel} && 0%{?rhel} <= 7 %package -n %{pythonx}-qpid-proton %{?python_provide:%python_provide python2-qpid-proton} Group: System Environment/Libraries @@ -210,6 +206,7 @@ Requires: %{pythonx} %license %{proton_licensedir}/LICENSE.txt %license %{proton_licensedir}/licenses.xml %{python2_sitearch}/* +%endif %if 0%{?fedora} || 0%{?rhel} > 7 @@ -244,21 +241,6 @@ Obsoletes: python-qpid-proton-doc %doc %{proton_datadir}/docs/api-py %doc %{proton_datadir}/examples/python -%if 0%{?fedora} -%package -n perl-qpid-proton -Summary: Perl language bindings for Qpid Proton messaging framework - -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: qpid-proton-c = %{version}-%{release} - -%description -n perl-qpid-proton -%{summary}. - -%files -n perl-qpid-proton -%doc LICENSE.txt README* -%{perl_vendorarch}/* -%endif - %prep %setup -q -n %{name}-%{version} @@ -288,7 +270,8 @@ export ADDCFLAGS=" -Wno-error=return-type" . %endif -make all docs %{?_smp_mflags} +#make all docs %{?_smp_mflags} +make all docs -j1 %if 0%{?fedora} || 0%{?rhel} > 7 (cd python/dist; %py3_build) %endif @@ -381,18 +364,9 @@ rm -fr %{buildroot}%{proton_datadir}/examples/php %check -%if 0%{?fedora} -# check perl bindings -pushd proton-c/bindings/perl -#make test -popd -%endif %changelog -* Sat Jul 14 2018 Fedora Release Engineering - 0.24.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jul 10 2018 Irina Boverman - 0.24.0-1 +* Tue Jul 24 2018 Irina Boverman - 0.24.0-1 - Rebased to 0.24.0 * Tue Jul 03 2018 Petr Pisar - 0.21.0-4 From fe9ba88b063dbe045d7de1ae72c4d40a33e900c1 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Thu, 26 Jul 2018 09:38:24 -0400 Subject: [PATCH 16/17] 0.24.0-2 --- qpid-proton.spec | 61 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index 88f62bb..85b98e2 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -189,7 +189,6 @@ Obsoletes: qpid-proton-cpp-devel-docs %doc %{proton_datadir}/examples/cpp/ssl-certs %doc %{proton_datadir}/examples/cpp/tutorial.dox -%if 0%{?rhel} && 0%{?rhel} <= 7 %package -n %{pythonx}-qpid-proton %{?python_provide:%python_provide python2-qpid-proton} Group: System Environment/Libraries @@ -206,7 +205,6 @@ Requires: %{pythonx} %license %{proton_licensedir}/LICENSE.txt %license %{proton_licensedir}/licenses.xml %{python2_sitearch}/* -%endif %if 0%{?fedora} || 0%{?rhel} > 7 @@ -249,16 +247,9 @@ Obsoletes: python-qpid-proton-doc %build -%if 0%{?fedora} -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 \ - . -%endif +mkdir buildpython2 +cd buildpython2 + %if 0%{?rhel} && 0%{?rhel} <= 7 %cmake \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,-z,relro,-z,now" \ @@ -267,26 +258,63 @@ export ADDCFLAGS=" -Wno-error=return-type" -DSYSINSTALL_BINDINGS=ON \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DENABLE_FUZZ_TESTING=NO \ - . + .. +%endif + +%if 0%{?fedora} || 0%{?rhel} > 7 +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" \ + .. %endif #make all docs %{?_smp_mflags} make all docs -j1 + %if 0%{?fedora} || 0%{?rhel} > 7 +(cd python/dist; %py2_build) +cd .. +mkdir buildpython3 +cd buildpython3 +%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 \ + .. +#make all docs %{?_smp_mflags} +make all docs -j1 (cd python/dist; %py3_build) %endif + %install rm -rf %{buildroot} +cd buildpython2 %make_install %if 0%{?fedora} || 0%{?rhel} > 7 +(cd python/dist; %py2_install) + +cd ../buildpython3 +%make_install (cd python/dist; %py3_install) %endif -CPROTON_BUILD=$PWD . ./config.sh +#CPROTON_BUILD=$PWD . ./config.sh -#chmod +x %{buildroot}%{python_sitearch}/_cproton.so +chmod +x %{buildroot}%{python2_sitearch}/_cproton.so +%if 0%{?fedora} || 0%{?rhel} > 7 +chmod +x %{buildroot}%{python3_sitearch}/_cproton.so +%endif #find %{buildroot}%{proton_datadir}/examples/ -type f | xargs chmod -x %if 0%{?rhel} && 0%{?rhel} <= 6 @@ -366,6 +394,9 @@ rm -fr %{buildroot}%{proton_datadir}/examples/php %check %changelog +* Thu Jul 26 2018 Irina Boverman - 0.24.0-2 +- Updated to build both python2- and python3-qpid-proton packages + * Tue Jul 24 2018 Irina Boverman - 0.24.0-1 - Rebased to 0.24.0 From 7b9c223e9e40b93214806912d4cdde502daefcb5 Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Thu, 26 Jul 2018 09:42:04 -0400 Subject: [PATCH 17/17] 0.24.0-2 --- qpid-proton.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qpid-proton.spec b/qpid-proton.spec index 85b98e2..ae5c4e2 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