From 428322ae4e303b02fd77db6fa61f6c3ffc135574818311a64e29cdab418af956 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Sat, 15 Aug 2015 13:19:40 +0000 Subject: [PATCH] Accepting request 321601 from home:seife:OpenStack:Master fix build on RHEL7, add PyJWT-1.1.0.diff OBS-URL: https://build.opensuse.org/request/show/321601 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyJWT?expand=0&rev=9 --- PyJWT-1.1.0.diff | 11 +++++++++++ python-PyJWT.changes | 10 ++++++++++ python-PyJWT.spec | 5 +++++ 3 files changed, 26 insertions(+) create mode 100644 PyJWT-1.1.0.diff diff --git a/PyJWT-1.1.0.diff b/PyJWT-1.1.0.diff new file mode 100644 index 0000000..7c21e3b --- /dev/null +++ b/PyJWT-1.1.0.diff @@ -0,0 +1,11 @@ +diff --git a/setup.py b/setup.py +index 2586c2a..dee928c 100755 +--- a/setup.py ++++ b/setup.py +@@ -78,6 +78,5 @@ setup( + 'Topic :: Utilities', + ], + test_suite='tests', +- tests_require=['pytest', 'pytest-cov'], + cmdclass={'test': PyTest}, + ) diff --git a/python-PyJWT.changes b/python-PyJWT.changes index 720d102..6776d23 100644 --- a/python-PyJWT.changes +++ b/python-PyJWT.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 10 09:20:26 UTC 2015 - seife+obs@b1-systems.com + +- apply PyJWT-1.1.0.diff only on RHEL/CentOS + +------------------------------------------------------------------- +Thu Jul 9 16:43:37 UTC 2015 - seife+obs@b1-systems.com + +- fix build on RHEL7, add PyJWT-1.1.0.diff + ------------------------------------------------------------------- Wed Apr 22 14:01:31 UTC 2015 - mcihar@suse.cz diff --git a/python-PyJWT.spec b/python-PyJWT.spec index d720373..fc6798a 100644 --- a/python-PyJWT.spec +++ b/python-PyJWT.spec @@ -24,6 +24,8 @@ Summary: JSON Web Token implementation in Python License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/P/PyJWT/PyJWT-%{version}.tar.gz +# PATCH-FIX-CENTOS PyJWT-1.1.0.diff -- without this, the centos build %%check will try to download stuff from pypi --seife +Patch1: PyJWT-1.1.0.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-cryptography BuildRequires: python-devel @@ -44,6 +46,9 @@ A Python implementation of JSON Web Token draft 01. %prep %setup -q -n PyJWT-%{version} +%if 0%{?rhel} +%patch1 -p1 +%endif %build python setup.py build