diff --git a/.gitignore b/.gitignore index 42cb44f..0fb66d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xnat-0.3.11.tar.gz +/xnat-0.3.17.tar.gz diff --git a/python-xnat.spec b/python-xnat.spec index ca53e31..6be591f 100644 --- a/python-xnat.spec +++ b/python-xnat.spec @@ -1,13 +1,7 @@ -%if 0%{?fedora} >= 30 -# disabled by default -%bcond_with py2 -%else -%bcond_without py2 -%endif - %bcond_with tests %global pypi_name xnat + %global desc %{expand: \ A new XNAT client that exposes XNAT objects/functions as python objects/functions. The aim is to abstract as much of the REST API away as possible and make xnatpy feel @@ -16,8 +10,8 @@ of the REST API. Low level functionality can still be accessed via the connectio which has get, head, put, post, delete methods for more directly calling the REST API.} Name: python-%{pypi_name} -Version: 0.3.11 -Release: 5%{?dist} +Version: 0.3.17 +Release: 1%{?dist} Summary: A new XNAT client that exposes XNAT objects/functions as python objects/functions. License: ASL 2.0 URL: http://pypi.python.org/pypi/%{pypi_name}/%{version} @@ -27,24 +21,8 @@ BuildArch: noarch %description %{desc} -%if %{with py2} -%package -n python2-%{pypi_name} -Summary: %{summary} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-isodate -BuildRequires: python2-requests -BuildRequires: python2-progressbar2 -BuildRequires: python2-sphinx_rtd_theme -BuildRequires: python2-six - %{?python_provide:%python_provide python2-%{pypi_name}} -%description -n python2-%{pypi_name} -%{desc} -%endif - %package -n python3-%{pypi_name} Summary: %{summary} @@ -68,41 +46,26 @@ rm -rf %{pypi_name}.egg-info %build %py3_build -%if %{with py2} -%py2_build -%endif %install -%if %{with py2} -%py2_install -%endif %py3_install %check %if %{with tests} -%if %{with py2} -%{__python2} setup.py test -%endif %{__python3} setup.py test %endif -%if %{with py2} -%files -n python2-%{pypi_name} -%license LICENSE -%doc README -%{_bindir}/xnat_cp_project -%{python2_sitelib}/%{pypi_name}-%{version}-py2.?.egg-info -%{python2_sitelib}/%{pypi_name} -%endif - %files -n python3-%{pypi_name} %license LICENSE -%doc README +%doc README.rst %{_bindir}/xnat_cp_project %{python3_sitelib}/xnat/ %{python3_sitelib}/xnat*.egg-info %changelog +* Mon Apr 08 2019 Luis Bazan - 0.3.17-1 +- New upstream version + * Sat Feb 02 2019 Fedora Release Engineering - 0.3.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 5b5f263..9317d25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xnat-0.3.11.tar.gz) = 4913178ca25768f776ba2474099abc3d563fc1d58393d673f9ef6a6b774c6ee90cb4ffd0c802e750878457780b45c06b8304b175f1d451a3e28466ca745292c7 +SHA512 (xnat-0.3.17.tar.gz) = f01b50927342dea5f1a83e269cbddfbbe5a068e9add40af7b2f4cc2a094008c449cf5143ac078eb76c7baa360803dc1a0c2b9512760c608dbef9013715897e26