[python-kombu] update to 3.0.21
Rahul Sundaram
sundaram at fedoraproject.org
Sun Jul 13 01:53:30 UTC 2014
commit f86e9061d6550b63ec51a49ad77dfb1546e95fba
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date: Sat Jul 12 21:53:49 2014 -0400
update to 3.0.21
- drop conditionals in spec
.gitignore | 1 +
python-kombu.spec | 49 ++++++++-----------------------------------------
sources | 2 +-
3 files changed, 10 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e9a6c33..1c7e657 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
/kombu-3.0.15.tar.gz
/kombu-3.0.19.tar.gz
/kombu-3.0.20.tar.gz
+/kombu-3.0.21.tar.gz
diff --git a/python-kombu.spec b/python-kombu.spec
index 94c43fe..88ea7c1 100644
--- a/python-kombu.spec
+++ b/python-kombu.spec
@@ -1,13 +1,7 @@
-%if 0%{?fedora} > 12
-%global with_python3 1
-%else
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
-%endif
-
%global srcname kombu
Name: python-%{srcname}
-Version: 3.0.20
+Version: 3.0.21
Release: 1%{?dist}
Epoch: 1
Summary: AMQP Messaging Framework for Python
@@ -21,16 +15,14 @@ BuildArch: noarch
BuildRequires: python2-devel
-%if 0%{?with_python3}
BuildRequires: python3-devel
BuildRequires: python3-nose
BuildRequires: python3-setuptools
BuildRequires: python3-anyjson
-# for python3 tests
+
BuildRequires: python3-mock
BuildRequires: python3-nose-cover3
BuildRequires: python3-coverage
-%endif # if with_python3
BuildRequires: python-setuptools
BuildRequires: python-nose
@@ -46,15 +38,12 @@ BuildRequires: python-msgpack
BuildRequires: python-amqp
BuildRequires: python-pymongo
-#%if 0%{?with_python3}
BuildRequires: python3-amqp
BuildRequires: python3-pymongo
-# tests:
BuildRequires: python3-nose
BuildRequires: python3-nose-cover3
BuildRequires: python3-mock
-#%endif
# For documentation
#BuildRequires: pymongo python-sphinx
@@ -73,7 +62,6 @@ 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}
%package -n python3-kombu
Summary: AMQP Messaging Framework for Python3
Group: Development/Languages
@@ -92,63 +80,42 @@ providing an idiomatic high-level interface for the AMQP protocol, and
also provide proven and tested solutions to common messaging problems.
This subpackage is for python3
-%endif # with_python3
%prep
%setup -q -n %{srcname}-%{version}
-
-%if 0%{?with_python3}
cp -a . %{py3dir}
-%endif
%build
%{__python2} setup.py build
# build python3-kombu
-%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py build
popd
-%endif # with_python3
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
-%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py install --skip-build --root %{buildroot}
popd
-%endif # with_python3
-
-# Documentation in docs folder is not useful without doing a make
-# Seems to have a circular dependency. Not building for now
-#cd docs && make html
-#cd - && mv docs/.build/html htmldocs
-#rm -rf docs
-#rm -f htmldocs/.buildinfo
-
-# sadly, tests don't succeed, yet
-#%check
-#%{__python2} setup.py test
-# tests with py3 are failing currently
-#%if 0%{?with_python3}
-#pushd %{py3dir}
-#%{__python3} setup.py test
-#popd
-#%endif # with_python3
+#fix non executable test script
+chmod +x %{buildroot}/%{python3_sitelib}/kombu/tests/test_serialization.py
%files
%doc AUTHORS Changelog FAQ LICENSE READ* THANKS TODO examples/
%{python2_sitelib}/kombu
%{python2_sitelib}/%{srcname}*.egg-info
-%if 0%{?with_python3}
%files -n python3-kombu
%doc AUTHORS Changelog FAQ LICENSE READ* THANKS TODO examples/
%{python3_sitelib}/*
-%endif # with_python3
%changelog
+* Sun Jul 13 2014 Rahul Sundaram <sundaram at fedoraproject.org> - 1:3.0.21-1
+- update to 3.0.21
+- drop conditionals in spec
+
* Thu Jul 03 2014 Fabian Affolter <mail at fabian-affolter.ch> - 1:3.0.20-1
- Update to latest upstream version 3.0.20 (rhbz#1114337)
diff --git a/sources b/sources
index f0bb35f..ef18274 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26ad1a9e417ffad1be938bab8cb91155 kombu-3.0.20.tar.gz
+081b10921ea31780aa4bdf871f4f3acb kombu-3.0.21.tar.gz
More information about the scm-commits
mailing list