From d3388ac5c11787a8ba72dddaf61a95d7ae39bb51 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Jan 26 2018 10:58:32 +0000 Subject: update to 0.5.6 fix requires for python2 and python2-django --- diff --git a/.gitignore b/.gitignore index 373691e..2d8bbb6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /django-simple-captcha-0.3.3.tar.gz /django-simple-captcha-0.4.2.tar.gz /django-simple-captcha-0.4.5.tar.gz +/django-simple-captcha-0.5.6.tar.gz diff --git a/python-django-simple-captcha.spec b/python-django-simple-captcha.spec index 5c1f229..6fd8c4d 100644 --- a/python-django-simple-captcha.spec +++ b/python-django-simple-captcha.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} > 12 +%if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 %endif %global pkgname django-simple-captcha @@ -6,16 +6,16 @@ Summary: Django application to add captcha images to any Django form Name: python-django-simple-captcha -Version: 0.4.5 -Release: 7%{?dist} +Version: 0.5.6 +Release: 1%{?dist} License: MIT Group: Development/Libraries URL: https://github.com/mbi/django-simple-captcha -Source: http://pypi.python.org/packages/source/d/%{pkgname}/%{pkgname}-%{version}.tar.gz +Source: https://github.com/mbi/%{pkgname}/archive/v{%version}.tar.gz#/%{pkgname}-%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel -BuildRequires: python-setuptools +BuildRequires: python2-setuptools BuildRequires: gettext %if 0%{?with_python3} @@ -32,10 +32,10 @@ Django application to add captcha images to any Django form %package -n python2-%{pkgname} Summary: %summary -Requires: python-django -Requires: python-pillow +Requires: python2-django1.11 +Requires: python2-pillow Requires: flite -Requires: python-six +Requires: python2-six Provides: %{pkgname} = %{version}-%{release} Obsoletes: %{pkgname} < %{obs_ver} %{?python_provide:%python_provide python2-%{pkgname}} @@ -63,43 +63,39 @@ Django application to add captcha images to any Django form # prevent pre-build egg-info in final package rm -rf django_simple_captcha.egg-info -%if 0%{?with_python3} -cp -a . %{py3dir} -%endif - %build -%{__python2} setup.py build +%py2_build %if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd +%py3_build %endif %install -%{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}" +%py2_install %if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}" -popd +%py3_install %endif %files -n python2-%{pkgname} -%doc LICENSE MANIFEST.in PKG-INFO +%doc LICENSE MANIFEST.in %{python_sitelib}/captcha/ %{python_sitelib}/django_simple_captcha-%{version}-py2* %if 0%{?with_python3} %files -n python3-%{pkgname} -%doc LICENSE MANIFEST.in PKG-INFO +%doc LICENSE MANIFEST.in %{python3_sitelib}/captcha/ %{python3_sitelib}/django_simple_captcha-%{version}-py3* %endif %changelog +* Fri Jan 26 2018 Matthias Runge - 0.5.6-1 +- update to 0.5.6 +- fix requirements to python2 and python2-django + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 0.4.5-7 - Python 2 binary package renamed to python2-django-simple-captcha See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 diff --git a/sources b/sources index 097df2b..aec3e43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2053e65d162fe6affd637d81e4e9daf7 django-simple-captcha-0.4.5.tar.gz +SHA512 (django-simple-captcha-0.5.6.tar.gz) = d7bfc02df059c7f023ea12ce23c43f5a6686c96304028565b2b3777fa7e1713a2c9193d399ff60b2b7ec08933e246ae17d16cdf873e94ee9d42b8f79c8b95784