diff --git a/.gitignore b/.gitignore index 54f2dd4..fb41de8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /adal-1.2.1.tar.gz /adal-1.2.2.tar.gz /adal-1.2.4.tar.gz +/adal-1.2.6.tar.gz diff --git a/python-adal.spec b/python-adal.spec index 1e522a1..72a4f0f 100644 --- a/python-adal.spec +++ b/python-adal.spec @@ -3,8 +3,8 @@ authenticate to AAD in order to access AAD protected web resources.} Name: python-%{srcname} -Version: 1.2.4 -Release: 3%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: ADAL for Python License: MIT @@ -13,7 +13,6 @@ Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz # Fix tests with httpretty >= 0.9.0 Patch0: %{name}-1.2.0-tests.patch -BuildRequires: make BuildRequires: python3-devel BuildRequires: %{py3_dist setuptools} # Required for tests @@ -24,8 +23,12 @@ BuildRequires: %{py3_dist pytest} BuildRequires: %{py3_dist python-dateutil} BuildRequires: %{py3_dist requests} # Required for documentation +BuildRequires: make BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-rtd-theme} +%if 0%{?fedora} <= 33 +BuildRequires: fonts-srpm-macros +%endif BuildArch: noarch %description @@ -34,7 +37,7 @@ BuildArch: noarch %package -n python3-%{srcname} Summary: %{summary} -%{?python_provide:%python_provide python3-%{srcname}} +%py_provides python3-%{srcname} %description -n python3-%{srcname} %{_description} @@ -42,6 +45,11 @@ Summary: %{summary} %package doc Summary: Documentation for %{name} +%if 0%{?fedora} <= 33 +Requires: fontawesome-fonts +Requires: google-roboto-slab-fonts +Requires: lato-font +%endif %description doc This package provides documentation for %{name}. @@ -64,9 +72,36 @@ rm docs/build/html/{.buildinfo,.nojekyll} %install %py3_install +rm docs/build/html/objects.inv + +# Drop bundled web fonts in HTML documentation +%if 0%{?fedora} <= 33 +pushd docs/build/html/_static/fonts/ + +for f in fontawesome-webfont.*; do + rm "$f" + [[ "${f##*.}" = "ttf" ]] && ln -s "%{_fontbasedir}/fontawesome/$f" . +done + +pushd Lato/ +rm * +for i in Bold BoldItalic Italic Regular; do + ln -s "%{_fontbasedir}/lato/Lato-$i.ttf" "lato-${i,,}.ttf" +done +popd + +pushd RobotoSlab/ +rm * +for i in Bold Regular; do + ln -s "%{_fontbasedir}/google-roboto-slab-fonts/RobotoSlab-$i.ttf" "roboto-slab-v7-${i,,}.ttf" +done +popd +popd +%endif + %check -pytest-%{python3_version} +%pytest %files -n python3-%{srcname} @@ -82,6 +117,9 @@ pytest-%{python3_version} %changelog +* Sat Feb 13 2021 Mohamed El Morabity - 1.2.6-1 +- Update to 1.2.6 + * Wed Jan 27 2021 Fedora Release Engineering - 1.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index a6d5f1a..86d5638 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (adal-1.2.4.tar.gz) = 9e1f2d4571f47211f585220817cfa3470a4ab0b42e6c95b6ce2872fb6cf27d3524fef1aa0400b0b2279470a7ba151038f2b8e767320da7b36c8f5b6305a6c3e6 +SHA512 (adal-1.2.6.tar.gz) = 50928df7a804d43826f28d3f4438dcb56114729c3e3fd2173fb8655624b1cd617ba1d79441c22a9723d4daa7e1d8534112fcdda78027be397c6cf6e2181b40a7