diff --git a/.gitignore b/.gitignore index be3adb7..003414a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /keyring-10.5.1.tar.gz /keyring-10.6.0.tar.gz /keyring-11.0.0.tar.gz +/keyring-13.2.0.tar.gz diff --git a/python-keyring.spec b/python-keyring.spec index 0d2da01..42be39b 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -1,11 +1,12 @@ %if 0%{?fedora} || 0%{?epel} || 0%{?rhel} > 7 +%global with_python2 1 %global with_python3 1 %endif %global with_tests 0 Name: python-keyring -Version: 11.0.0 -Release: 4%{?dist} +Version: 13.2.0 +Release: 1%{?dist} Summary: Store and access your passwords safely License: MIT and Python URL: https://github.com/jaraco/keyring @@ -34,6 +35,7 @@ Python keyring lib also provides following build-in keyrings.\ %description %desc +%if 0%{?with_python2} %package -n python2-keyring Summary: Python 2 library to access the system keyring service BuildRequires: python2-devel @@ -58,6 +60,7 @@ Obsoletes: %{name}-gnome < %{version}-%{release} %description -n python2-keyring %desc +%endif %if 0%{?with_python3} %package -n python%{python3_pkgversion}-keyring @@ -90,17 +93,22 @@ sed -i -e "\@use_vcs_version@s/^.*$/\tversion = \"%{version}\",/g" \ -e {/\'hgtools\'/d} setup.py %build +%if 0%{?with_python2} %py2_build +%endif %if 0%{?with_python3} %py3_build %endif %install +%if 0%{?with_python2} +%py2_install +mv %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-python2 +%endif %if 0%{?with_python3} %py3_install -cp -a %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-%{python3_version} +cp -a %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-python%{python3_pkgversion} %endif -%py2_install # Failed on Koji due to X environment not available. %check @@ -109,25 +117,33 @@ cp -a %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-%{python3_ve %{__python3} setup.py test nosetests-%{python3_version} %endif +%if 0%{?with_python2} %{__python2} setup.py test nosetests-%{python2_version} %endif +%endif +%if 0%{?with_python2} %files -n python2-keyring %doc CHANGES.rst README.rst -%{_bindir}/keyring +%{_bindir}/keyring-python2 %{python2_sitelib}/keyring %{python2_sitelib}/keyring-%{version}-py%{python2_version}.egg-info +%endif %if 0%{?with_python3} %files -n python%{python3_pkgversion}-keyring %doc CHANGES.rst README.rst -%{_bindir}/keyring-%{python3_version} +%{_bindir}/keyring-python%{python3_pkgversion} +%{_bindir}/keyring %{python3_sitelib}/keyring-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/keyring %endif %changelog +* Thu Jul 05 2018 Christopher Tubbs - 13.2.0-1 +- Update to 13.2.0 + * Mon Jun 18 2018 Miro HronĨok - 11.0.0-4 - Rebuilt for Python 3.7 diff --git a/sources b/sources index b739001..c6f4961 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keyring-11.0.0.tar.gz) = d4937e84e6de18ed8fcba02d2d297ecc5a6434623c362f5608141041acbc7bc27fbf94e54a5a503a02b725df737fa8505d0d91e2c3e84298fa4044d7dc99f207 +SHA512 (keyring-13.2.0.tar.gz) = e076cf08b56fdc1af9f1fddb747013daa4cdc592585df877d31a3795d7de9b313141bdd0721be41797473df0ac5620c1d06d5e19927c909079656d7c74431f04