diff --git a/.gitignore b/.gitignore index 6331e1c..f060133 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /python-adal-0.1.0.tar.gz +/python-adal-0.4.3.tar.gz diff --git a/python-adal-0.4.3-build.patch b/python-adal-0.4.3-build.patch new file mode 100644 index 0000000..11d19bb --- /dev/null +++ b/python-adal-0.4.3-build.patch @@ -0,0 +1,15 @@ +diff -up ./setup.py.orig ./setup.py +--- ./setup.py.orig 2016-11-18 23:52:09.000000000 +0100 ++++ ./setup.py 2016-12-02 15:25:53.579541582 +0100 +@@ -72,8 +72,8 @@ setup( + packages=['adal'], + install_requires=[ + 'PyJWT>=1.0.0', +- 'requests>=2.0.0,!=2.12.*', +- 'python-dateutil>=2.1.0', +- 'cryptography>=1.1.0' ++ 'requests>=2.0.0,<2.12', ++ 'python-dateutil', ++ 'cryptography' + ] + ) diff --git a/python-adal.spec b/python-adal.spec index fadccf0..acb68fc 100644 --- a/python-adal.spec +++ b/python-adal.spec @@ -6,18 +6,21 @@ authenticate to AAD in order to access AAD protected web resources. Name: python-%{python_module} -Version: 0.1.0 -Release: 3%{?dist} +Version: 0.4.3 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: MIT URL: https://github.com/AzureAD/azure-activedirectory-library-for-python/ Source0: https://github.com/AzureAD/%{alt_name}/archive/%{version}/%{name}-%{version}.tar.gz +# Fix install_requires option, for EPEL especially +Patch0: %{name}-0.4.3-build.patch BuildRequires: python-setuptools BuildRequires: python2-devel # Needed for tests +BuildRequires: python-cryptography BuildRequires: python-dateutil BuildRequires: python-httpretty BuildRequires: python-jwt @@ -25,6 +28,7 @@ BuildRequires: python-requests %if 0%{?fedora} BuildRequires: python3-devel # Needed for tests +BuildRequires: python3-cryptography BuildRequires: python3-dateutil BuildRequires: python3-httpretty BuildRequires: python3-jwt @@ -38,6 +42,8 @@ BuildArch: noarch %package -n python2-%{python_module} Summary: %{common_summary} +Requires: python-dateutil +Requires: python-jwt Requires: python-requests %{?python_provide:%python_provide python2-%{python_module}} @@ -49,6 +55,8 @@ Requires: python-requests %if 0%{?fedora} %package -n python3-%{python_module} Summary: %{common_summary} +Requires: python3-dateutil +Requires: python3-jwt Requires: python3-requests %{?python_provide:%python_provide python3-%{python_module}} @@ -60,8 +68,15 @@ Requires: python3-requests %prep %autosetup -n %{alt_name}-%{version} +# Remove BOM +pushd adal/ +tail --bytes=+4 __init__.py >__init__.py.new && \ +touch -r __init__.py __init__.py.new && \ +mv __init__.py.new __init__.py +popd + # Delete tests requiring a valid Azure account -rm tests/test_e2e_examples.py +rm tests/{test_client_credentials.py,test_e2e_examples.py} %build @@ -94,6 +109,9 @@ rm tests/test_e2e_examples.py %changelog +* Sun Dec 04 2016 Mohamed El Morabity - 0.4.3-1 +- Update to 0.4.3 + * Tue Jul 19 2016 Fedora Release Engineering - 0.1.0-3 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index cfc9ac1..476a432 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df767d015b70d86f96ff572fd286850d python-adal-0.1.0.tar.gz +210b407c13f06aa90c8088d6baf02315 python-adal-0.4.3.tar.gz