#1 Update to 4.1.0 && Removed python2 subpackage
Merged 2 years ago by churchyard. Opened 2 years ago by churchyard.
rpms/ churchyard/python-django-avatar nopy2  into  master

file modified
+9 -52

@@ -1,8 +1,8 @@ 

  %global pypi_name django-avatar

  

  Name:           python-%{pypi_name}

- Version:        3.1.0

- Release:        4%{?dist}

+ Version:        4.1.0

+ Release:        1%{?dist}

  Summary:        A django module for handling user avatars

  

  License:        BSD

@@ -17,33 +17,6 @@ 

  Django-avatar automatically generates thumbnails and stores them to your

  default file storage back-end for retrieval later.

  

- %package -n python2-%{pypi_name}

- Summary:        A django module for handling user avatars - Python 2 version

- 

- BuildRequires:  python2-setuptools

- BuildRequires:  python2-devel

- # Test dependencies

- BuildRequires:  python2-coverage

- BuildRequires:  python2-django

- BuildRequires:  python-django-appconf

- BuildRequires:  python2-imaging

- BuildRequires:  python-six

- 

- Requires:       python2-django

- Requires:       python2-imaging

- 

- Provides:       %{pypi_name} = %{version}-%{release}

- Obsoletes:      %{pypi_name} < 2.0a1-5

- 

- %{?python_provide:%python_provide python2-%{pypi_name}}

- 

- %description -n python2-%{pypi_name}

- Django-avatar is a reusable application for handling user avatars. It has the

- ability to default to Gravatar if no avatar is found for a certain user.

- Django-avatar automatically generates thumbnails and stores them to your

- default file storage back-end for retrieval later.

- This package provides Python 2 build of %{pypi_name}.

- 

  

  %package -n python3-%{pypi_name}

  Summary:        A django module for handling user avatars - Python 3 version

@@ -60,6 +33,9 @@ 

  Requires:       python3-django

  Requires:       python3-imaging

  

+ Obsoletes:      python-%{pypi_name} < 4

+ Obsoletes:      python2-%{pypi_name} < 4

+ 

  %{?python_provide:%python_provide python3-%{pypi_name}}

  

  %description -n python3-%{pypi_name}

@@ -73,38 +49,17 @@ 

  %autosetup -n %{pypi_name}-%{version}

  

  %build

- %py2_build

  %py3_build

  

  %install

- %py2_install

  %py3_install

  %find_lang django

  

  %check

  PYTHONPATH=. \

  DJANGO_SETTINGS_MODULE=tests.settings \

- python2-coverage run %{python2_sitelib}/django/bin/django-admin.py test tests

- 

- PYTHONPATH=. \

- DJANGO_SETTINGS_MODULE=tests.settings \

  python3-coverage run %{python3_sitelib}/django/bin/django-admin.py test tests

  

- %files -f django.lang -n python2-%{pypi_name}

- %license LICENSE.txt

- %doc PKG-INFO CONTRIBUTORS.txt README.rst

- %dir %{python2_sitelib}/avatar/

- %{python2_sitelib}/avatar/*.py*

- %{python2_sitelib}/avatar/management/

- %{python2_sitelib}/avatar/media/

- %{python2_sitelib}/avatar/migrations/

- %{python2_sitelib}/avatar/templates/

- %{python2_sitelib}/avatar/locale/*/*/*.po

- %{python2_sitelib}/avatar/templatetags/

- %{python2_sitelib}/*.egg-info/

- # find_lang will find both python2 and python3 locale files

- %exclude %{python3_sitelib}/avatar/locale

- 

  %files -f django.lang -n python3-%{pypi_name}

  %license LICENSE.txt

  %doc PKG-INFO CONTRIBUTORS.txt README.rst

@@ -118,10 +73,12 @@ 

  %{python3_sitelib}/avatar/templatetags/

  %{python3_sitelib}/avatar/__pycache__/

  %{python3_sitelib}/*.egg-info/

- # find_lang will find both python2 and python3 locale files

- %exclude %{python2_sitelib}/avatar/locale

  

  %changelog

+ * Tue Feb 20 2018 Miro Hrončok <mhroncok@redhat.com> - 4.1.0-1

+ - Update to 4.1.0

+ - Removed python2 subpackage for https://fedoraproject.org/wiki/Changes/Django20

+ 

  * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-4

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild