From 87b7c0be6269819083452a892789ec3392d2e34f Mon Sep 17 00:00:00 2001 From: Fabio Alessandro Locati Date: Tue, 13 Sep 2016 10:08:44 +0100 Subject: [PATCH] Add testing support for EL7 --- botocore-1.4.52-fix_dateutil_version.patch | 10 ++++++++++ python-botocore.spec | 23 +++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 botocore-1.4.52-fix_dateutil_version.patch diff --git a/botocore-1.4.52-fix_dateutil_version.patch b/botocore-1.4.52-fix_dateutil_version.patch new file mode 100644 index 0000000..af01a2d --- /dev/null +++ b/botocore-1.4.52-fix_dateutil_version.patch @@ -0,0 +1,10 @@ +diff -ur botocore-1.4.52.orig/requirements.txt botocore-1.4.52/requirements.txt +--- botocore-1.4.52.orig/requirements.txt 2016-09-12 23:35:35.452304693 +0100 ++++ botocore-1.4.52/requirements.txt 2016-09-12 23:36:02.418770777 +0100 +@@ -1,5 +1,5 @@ + tox>=2.3.1,<3.0.0 +-python-dateutil>=2.1,<3.0.0 ++python-dateutil>=1.4,<3.0.0 + nose==1.3.0 + mock==1.3.0 + wheel==0.24.0 diff --git a/python-botocore.spec b/python-botocore.spec index ad97cac..73c0990 100644 --- a/python-botocore.spec +++ b/python-botocore.spec @@ -1,10 +1,6 @@ -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 %global with_python3 0 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}} -%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}} +%global fix_dateutil 1 %else %global with_python3 1 %endif @@ -18,12 +14,13 @@ Name: python-%{pypi_name} Version: 1.4.52 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Low-level, data-driven core of boto 3 License: ASL 2.0 URL: https://github.com/boto/botocore Source0: https://pypi.io/packages/source/b/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Patch0: botocore-1.4.52-fix_dateutil_version.patch BuildArch: noarch BuildRequires: python2-devel @@ -69,7 +66,11 @@ botocore package is the foundation for the AWS CLI as well as boto3. %package -n python2-%{pypi_name} Summary: Low-level, data-driven core of boto 3 Requires: python-jmespath >= 0.7.1 +%if 0%{?fix_dateutil} +Requires: python-dateutil >= 1.4 +%else Requires: python-dateutil >= 2.1 +%endif Requires: python-docutils >= 0.10 %{?el6:Provides: python-%{pypi_name}} %{?python_provide:%python_provide python2-%{pypi_name}} @@ -82,7 +83,11 @@ botocore package is the foundation for the AWS CLI as well as boto3. %package -n python3-%{pypi_name} Summary: Low-level, data-driven core of boto 3 Requires: python3-jmespath >= 0.7.1 +%if 0%{?fix_dateutil} +Requires: python3-dateutil >= 1.4 +%else Requires: python3-dateutil >= 2.1 +%endif Requires: python3-docutils >= 0.10 %{?python_provide:%python_provide python3-%{pypi_name}} @@ -100,6 +105,7 @@ Summary: Documentation for %{name} %prep %setup -q -n %{pypi_name}-%{version} +%{?fix_dateutil:%patch0 -p1} sed -i -e '1 d' botocore/vendored/requests/packages/chardet/chardetect.py sed -i -e '1 d' botocore/vendored/requests/certs.py rm -rf %{pypi_name}.egg-info @@ -159,6 +165,9 @@ nosetests-3.5 --with-coverage --cover-erase --cover-package botocore --with-xuni %endif # with_docs %changelog +* Tue Sep 13 2016 Fabio Alessandro Locati - 1.4.52-2 +- Add testing support for EL7 using a lower version of dateuil library + * Wed Sep 07 2016 Fabio Alessandro Locati - 1.4.52-1 - Update to 1.4.52