From bf011e1da13e72d5eb6fd4dbbf0def4a80c6e251 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jan 28 2019 23:40:54 +0000 Subject: Update to 4.2.2 - Fix summary for Python 2 subpackage - Switch to bconds for controlling the build - Add EPEL7 compatibility --- diff --git a/.gitignore b/.gitignore index f3cffef..d22647a 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /kombu-4.0.2.tar.gz /kombu-4.2.0.tar.gz /kombu-4.2.1.tar.gz +/kombu-4.2.2.tar.gz diff --git a/python-kombu.spec b/python-kombu.spec index be1505a..7ecbdac 100644 --- a/python-kombu.spec +++ b/python-kombu.spec @@ -1,24 +1,30 @@ -%if 0%{?fedora} -%global with_python3 1 +%if 0%{?rhel} && 0%{?rhel} < 8 +%bcond_with python3 +%bcond_with tests +%else +%bcond_without python3 +%bcond_without tests %endif %global srcname kombu Name: python-%{srcname} -Version: 4.2.1 -Release: 3%{?dist} +Version: 4.2.2 +Release: 1%{?dist} Epoch: 1 Summary: An AMQP Messaging Framework for Python # utils/functional.py contains a header that says Python License: BSD and Python URL: http://kombu.readthedocs.org/ -Source0: https://github.com/celery/kombu/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz +Source0: https://github.com/celery/kombu/archive/v%{version}/%{srcname}-%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel BuildRequires: python2-setuptools + +%if %{with tests} BuildRequires: python2-nose BuildRequires: python2-nose-cover3 @@ -29,6 +35,7 @@ BuildRequires: python2-pyyaml BuildRequires: python2-msgpack BuildRequires: python2-amqp BuildRequires: python2-pymongo +%endif # For documentation #BuildRequires: python2-pymongo python2-sphinx @@ -46,16 +53,18 @@ providing an idiomatic high-level interface for the AMQP protocol, and also provide proven and tested solutions to common messaging problems. %package -n python2-%{srcname} -Summary: %{sum} +Summary: %{summary} Requires: python2-amqp >= 2.1.4 Requires: python2-vine +%if %{with tests} # test requirements BuildRequires: python2-pytest BuildRequires: python2-pytest-cov BuildRequires: python2-vine BuildRequires: python2-case BuildRequires: python2-pytz +%endif %{?python_provide:%python_provide python2-%{srcname}} %description -n python2-%{srcname} @@ -68,7 +77,7 @@ The aim of Kombu is to make messaging in Python as easy as possible by providing an idiomatic high-level interface for the AMQP protocol, and also provide proven and tested solutions to common messaging problems. -%if 0%{?with_python3} +%if %{with python3} %package -n python3-%{srcname} Summary: %{summary} Requires: python3-amqp >= 2.1.4 @@ -76,6 +85,7 @@ Requires: python3-vine BuildRequires: python3-devel BuildRequires: python3-setuptools +%if %{with tests} BuildRequires: python3-mock BuildRequires: python3-nose-cover3 BuildRequires: python3-coverage @@ -85,6 +95,7 @@ BuildRequires: python3-nose BuildRequires: python3-vine BuildRequires: python3-case BuildRequires: python3-pytz +%endif %{?python_provide:%python_provide python3-%{srcname}} %description -n python3-%{srcname} @@ -103,14 +114,14 @@ also provide proven and tested solutions to common messaging problems. %build %py2_build -%if 0%{?with_python3} +%if %{with python3} %py3_build %endif %install %py2_install -%if 0%{?with_python3} +%if %{with python3} %py3_install %endif @@ -124,7 +135,7 @@ also provide proven and tested solutions to common messaging problems. %{python2_sitelib}/%{srcname} %{python2_sitelib}/%{srcname}*.egg-info -%if 0%{?with_python3} +%if %{with python3} %files -n python3-%{srcname} %doc AUTHORS Changelog FAQ READ* THANKS TODO examples/ %license LICENSE @@ -133,6 +144,12 @@ also provide proven and tested solutions to common messaging problems. %endif %changelog +* Mon Jan 28 2019 Neal Gompa - 1:4.2.2-1 +- Update to 4.2.2 +- Fix summary for Python 2 subpackage +- Switch to bconds for controlling the build +- Add EPEL7 compatibility + * Sat Jul 14 2018 Fedora Release Engineering - 1:4.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 7023d4a..acbb31a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kombu-4.2.1.tar.gz) = 819aed2628f4b3b546d8c88ad35fd6a72761ae2ff3d5f31db995f010c708231d366df1debd7b1f5c3c9669081c9165eca1c622d39eb4f3b95e75abef8b0e966f +SHA512 (kombu-4.2.2.tar.gz) = ce7c27234bac6fb45cde11e548195440d554f9ad083cc7f05cd9e5e376eed104a984e020a0088661abbc07f232067329f9571af5a322da0741dd7e1e5cca0b63