[python-django-countries] Update to version 2.1.2

[Bohuslav Kabrda]

commit 866cd897879cf53b3cdff3c1b5cb046a8acfb994
Author: Slavek Kabrda <bkabrda at redhat.com>
Date:   Mon Jun 9 12:06:59 2014 +0200

    Update to version 2.1.2

 .gitignore                   |    1 +
 python-django-countries.spec |   29 +++++++++++++----------------
 sources                      |    3 +--
 3 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae83172..f947ac3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /django-countries-1.3-test_proj.tgz
 /django-countries-1.3.tar.gz
+/django-countries-2.1.2.tar.gz
diff --git a/python-django-countries.spec b/python-django-countries.spec
index ffd8e61..501fb63 100644
--- a/python-django-countries.spec
+++ b/python-django-countries.spec
@@ -2,20 +2,18 @@
 %global obs_ver 1.0.5-6
 
 Name:           python-%{pypi_name}
-Version:        1.3
-Release:        4%{?dist}
+Version:        2.1.2
+Release:        1%{?dist}
 Summary:        Provides a country field for Django models
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://pypi.python.org/pypi/django-countries
 Source0:        http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
-# Steps to generate the test project: https://bitbucket.org/smileychris/django-countries/issue/18/#comment-1807293
-Source1:        %{pypi_name}-%{version}-test_proj.tgz
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 BuildRequires:  python-django
 Requires:       python-django
 
@@ -36,33 +34,29 @@ rm -rf django_countries/models.py
 
 %install
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{python_sitelib}/django_countries/bin/titlecase.py
 
 %find_lang django
 
 pushd $RPM_BUILD_ROOT
 # delete the unnecessary *.po files
 find -type f -name '*.po' -exec rm {} \;
-# avoid the /usr/bin/env dependency, make the files executable
-find .%{python_sitelib}/django_countries/bin -type f -exec chmod +x {} \;
-find .%{python_sitelib}/django_countries/bin -type f -exec sed -i 's|/usr/bin/env python|%{__python}|' {} \;
 popd
 
 %check
-tar xzf %{SOURCE1}
-pushd test_proj
+#pushd test_proj
 # django apps are not testable without models.py file
 # this is created in setup.py install, but not present in upstream source, so create it here for tests
-touch ../django_countries/models.py
-PYTHONPATH=.. %{__python} manage.py test django_countries
-popd
+#touch ../django_countries/models.py
+PYTHONPATH=$(pwd) \
+DJANGO_SETTINGS_MODULE=django_countries.tests.settings \
+%{__python} %{_bindir}/django-admin test django_countries.tests
+#popd
 
 %files -f django.lang
-%doc LICENSE README
+%doc LICENSE README.rst
 %exclude %{python_sitelib}/django_countries/tests
 %dir %{python_sitelib}/django_countries/
 %{python_sitelib}/django_countries/*.py*
-%{python_sitelib}/django_countries/bin
 # own all the locale directories
 %dir %{python_sitelib}/django_countries/locale/
 %dir %{python_sitelib}/django_countries/locale/*/
@@ -71,6 +65,9 @@ popd
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Mon Jun 09 2014 Bohuslav Kabrda <bkabrda at redhat.com> - 2.1.2-1
+- Update to version 2.1.2
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b7946a0..e0f61ae 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-37022208106029c0c7e9dc15bb43b290  django-countries-1.3-test_proj.tgz
-002fa3a2174e98ede9fc8d86a220b908  django-countries-1.3.tar.gz
+15e19fd70be1e8939f1bffcfe008e878  django-countries-2.1.2.tar.gz