diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..47e0616 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/qpid-dispatch-1.15.0.tar.gz +/qpid-dispatch-console-1.15.0.tar.gz diff --git a/licenses.xml b/licenses.xml index 242fc4a..7fdff74 100644 --- a/licenses.xml +++ b/licenses.xml @@ -3,7 +3,7 @@ qpid-dispatch - 1.14.0 + 1.15.0 ASL 2.0 diff --git a/qpid-dispatch.spec b/qpid-dispatch.spec index 10b2e0c..5f90e11 100644 --- a/qpid-dispatch.spec +++ b/qpid-dispatch.spec @@ -29,12 +29,15 @@ %endif -%global proton_minimum_version 0.31.0 -%global libwebsockets_minimum_version 3.2.0 +%global proton_minimum_version 0.33.0 +%global libwebsockets_minimum_version 3.2.3 +%global libnghttp2_minimum_version 1.33.0 + +%undefine __brp_mangle_shebangs Name: qpid-dispatch -Version: 1.14.0 -Release: 2%{?dist} +Version: 1.15.0 +Release: 1%{?dist} Summary: Dispatch router for Qpid License: ASL 2.0 URL: http://qpid.apache.org/ @@ -66,14 +69,10 @@ BuildRequires: qpid-proton-c-devel >= %{proton_minimum_version} BuildRequires: %{pythonx}-devel BuildRequires: %{pythonx}-qpid-proton >= %{proton_minimum_version} BuildRequires: openssl-devel - -# Missing dependency on RHEL 6: asciidoc >= 8.6.8 -# asciidoc-8.4.5-4.1.el6 does not work for man pages -%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7) -BuildRequires: libwebsockets-devel >= %{libwebsockets_minimum_version} +BuildRequires: libwebsockets-devel = %{libwebsockets_minimum_version} +BuildRequires: libnghttp2-devel >= %{libnghttp2_minimum_version} BuildRequires: asciidoc >= 8.6.8 BuildRequires: systemd -%endif %if 0%{?fedora} BuildRequires: rubygem-asciidoctor %endif @@ -94,9 +93,8 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd %endif -%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7) Requires: libwebsockets >= %{libwebsockets_minimum_version} -%endif +Requires: libnghttp2 >= %{libnghttp2_minimum_version} %description router %{summary}. @@ -113,7 +111,10 @@ Requires: libwebsockets >= %{libwebsockets_minimum_version} %{python2_sitelib}/* %endif %if (0%{?fedora} && 0%{?fedora} >= 29) || (0%{?rhel} && 0%{?rhel} > 7) -%{python3_sitelib}/* +%{python3_sitelib}/qpid_dispatch_site.py* +%{python3_sitelib}/qpid_dispatch +%{python3_sitelib}/qpid_dispatch-*.egg-info +%{python3_sitelib}/__pycache__/* %endif %if %{_use_systemd} @@ -228,19 +229,13 @@ tar xvzpf %{SOURCE1} -C . %endif %build -export DOCS=ON -export LIBWEBSOCKETS=ON -%if 0%{?rhel} && 0%{?rhel} <= 6 -export DOCS=OFF -export LIBWEBSOCKETS=OFF -%endif %cmake -DDOC_INSTALL_DIR=%{?_pkgdocdir} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DUSE_SETUP_PY=0 \ -DQD_DOC_INSTALL_DIR=%{_pkgdocdir} \ - "-DBUILD_DOCS=$DOCS" \ + -DBUILD_DOCS=ON \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ - "-DUSE_LIBWEBSOCKETS=$LIBWEBSOCKETS" \ + -DUSE_LIBWEBSOCKETS=ON \ -DCONSOLE_INSTALL=OFF \ . make @@ -289,7 +284,6 @@ cp -a %{_builddir}/qpid-dispatch-%{version}/pre_built/console/* %{buildroot}/%{_ rm -f %{buildroot}/%{_includedir}/qpid/dispatch.h rm -fr %{buildroot}/%{_includedir}/qpid/dispatch -rm -fr %{buildroot}/%{_datarootdir}/qpid-dispatch/console/stand-alone %post -p /sbin/ldconfig @@ -297,6 +291,9 @@ rm -fr %{buildroot}/%{_datarootdir}/qpid-dispatch/console/stand-alone %changelog +* Thu Mar 18 2021 Irina Boverman - 1.15.0-1 +- Rebased to 1.15.0 + * Wed Jan 27 2021 Fedora Release Engineering - 1.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 800f7d8..590ef76 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qpid-dispatch-1.14.0.tar.gz) = a28748b50bdae512e1d1af7a0099cd8c56d516a9e2f10bee89c3062bfd682c5b302be987ef2fe6cb330ef33d5877aa4c6d41e3c42ba9688994d2ac20df142c77 -SHA512 (qpid-dispatch-console-1.14.0.tar.gz) = d36915330a8c929b8662d94aa2ee000b6204533c69308d0025633e5997531f3925806c835effed4a5efa507e74d8b6d843601c673208cf14ca2b0678224b5b4c +SHA512 (qpid-dispatch-1.15.0.tar.gz) = bf5b36bbe67981ac6c5dc43147cf8051c86c46918b6c79d4cb54b6fbd1fa7d140464d9dedd6840a3f0b1bb19e965aca601b57a011d3fe78240a48f7747e440f7 +SHA512 (qpid-dispatch-console-1.15.0.tar.gz) = cedf64f7bc04d7e8ba28937991e6bd795f2f822e6ad9f2021c3d6b0273215b9c1fd65a98dfeee6af6125d26aa6e01ea54cd87df7cd3fea3ca9bf9daf27a3ee58