diff --git a/ast_drop-compatible-releases-operator.patch b/ast_drop-compatible-releases-operator.patch index 5c6ff61..77ee2d6 100644 --- a/ast_drop-compatible-releases-operator.patch +++ b/ast_drop-compatible-releases-operator.patch @@ -1,13 +1,13 @@ -diff -Nru aws-sam-translator-1.9.0.orig/requirements/base.txt aws-sam-translator-1.9.0/requirements/base.txt ---- aws-sam-translator-1.9.0.orig/requirements/base.txt 2018-11-29 18:53:32.000000000 +0100 -+++ aws-sam-translator-1.9.0/requirements/base.txt 2019-01-21 13:38:19.566088857 +0100 +diff -Nru serverless-application-model-1.11.0.orig/requirements/base.txt serverless-application-model-1.11.0/requirements/base.txt +--- serverless-application-model-1.11.0.orig/requirements/base.txt 2019-04-26 00:03:58.000000000 +0200 ++++ serverless-application-model-1.11.0/requirements/base.txt 2019-07-10 14:43:48.484197605 +0200 @@ -1,5 +1,5 @@ -boto3~=1.5 -enum34~=1.1; python_version<"3.4" -jsonschema~=2.6 -six~=1.11 +boto3>=1.5 -+enum34>=1.1; python_version<"3.4" ++enum34>=1.1 +jsonschema>=2.6 +six>=1.11 diff --git a/python-aws-sam-translator.changes b/python-aws-sam-translator.changes index f1a8054..05e315e 100644 --- a/python-aws-sam-translator.changes +++ b/python-aws-sam-translator.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 11 09:43:24 UTC 2019 - John Paul Adrian Glaubitz + +- Fix build on SLE-12 + + Add python to BuildRequires for suse_version < 1500 + + Set LANG to en_US.UTF8 before running testsuite + + Refresh ast_drop-compatible-releases-operator.patch to + strip "python_version<"3.4"" from install_requires + ------------------------------------------------------------------- Wed Jun 5 18:12:58 UTC 2019 - Todd R diff --git a/python-aws-sam-translator.spec b/python-aws-sam-translator.spec index d85cb74..31c0865 100644 --- a/python-aws-sam-translator.spec +++ b/python-aws-sam-translator.spec @@ -26,6 +26,9 @@ Group: Development/Languages/Python Url: https://github.com/awslabs/serverless-application-model Source: https://github.com/awslabs/serverless-application-model/archive/v%{version}.tar.gz#/serverless-application-model-%{version}.tar.gz Patch: ast_drop-compatible-releases-operator.patch +%if 0%{?suse_version} < 1500 +BuildRequires: python +%endif BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -36,9 +39,9 @@ BuildRequires: %{python_module coverage >= 4.4.0} BuildRequires: %{python_module jsonschema >= 2.6} BuildRequires: %{python_module mock >= 2.0.0} BuildRequires: %{python_module parameterized >= 0.6.1} +BuildRequires: %{python_module py >= 1.4.33} BuildRequires: %{python_module pytest >= 3.0.7} BuildRequires: %{python_module pytest-cov >= 2.4.0} -BuildRequires: %{python_module py >= 1.4.33} BuildRequires: %{python_module requests >= 2.20.0} BuildRequires: %{python_module six >= 1.11} BuildRequires: python-enum34 >= 1.1 @@ -75,6 +78,7 @@ mkdir -p %{buildroot}%{_bindir} install -D -m 644 bin/sam-translate.py %{buildroot}%{_bindir}/sam-translate %check +export LANG=en_US.UTF8 %pytest %files %{python_files}