diff --git a/.gitignore b/.gitignore index 7018a61..d1f3021 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +1 @@ -/Django-1.4.tar.gz -/Django-1.4.1.tar.gz -/Django-1.4.2.tar.gz -/Django-1.4.3.tar.gz -/Django-1.4.4.tar.gz -/Django-1.4.5.tar.gz -/simplejson-init.py -/Django-1.5.tar.gz -/Django-1.5.1.tar.gz -/Django-1.5.2.tar.gz -/Django-1.5.3.tar.gz -/Django-1.5.4.tar.gz -/Django-1.5.5.tar.gz -/Django-1.6.tar.gz -/Django-1.6.2.tar.gz -/Django-1.6.3.tar.gz -/Django-1.6.4.tar.gz -/Django-1.6.5.tar.gz -/Django-1.6.6.tar.gz -/Django-1.6.7.tar.gz -/Django-1.7.tar.gz -/Django-1.7.1.tar.gz -/Django-1.7.2.tar.gz -/Django-1.7.3.tar.gz -/Django-1.8b1.tar.gz -/Django-1.8b2.tar.gz -/Django-1.8c1.tar.gz -/Django-1.8.tar.gz -/Django-1.8.1.tar.gz -/Django-1.8.2.tar.gz -/Django-1.8.3.tar.gz -/Django-1.8.4.tar.gz -/Django-1.8.5.tar.gz -/Django-1.8.6.tar.gz -/Django-1.8.7.tar.gz -/Django-1.8.8.tar.gz -/Django-1.9.2.tar.gz -/Django-1.9.3.tar.gz -/Django-1.9.4.tar.gz -/Django-1.9.6.tar.gz -/Django-1.9.7.tar.gz +/Django-1.*.tar.gz diff --git a/python-django.spec b/python-django.spec index a80466e..fcfcfd4 100644 --- a/python-django.spec +++ b/python-django.spec @@ -35,11 +35,6 @@ BuildArch: noarch Requires: %{name}-bash-completion = %{version}-%{release} -# allow users to use django with lowercase d -Provides: django = %{version}-%{release} -Provides: %{pkgname} = %{version}-%{release} -Obsoletes: %{pkgname} < %{obs_ver} - %description Django is a high-level Python Web framework that encourages rapid @@ -68,6 +63,12 @@ BuildRequires: python-selenium BuildRequires: python-sqlparse BuildRequires: python-memcached +# allow users to use django with lowercase d +Provides: django = %{version}-%{release} +Provides: %{pkgname} = %{version}-%{release} +Obsoletes: %{pkgname} < %{obs_ver} +Obsoletes: python-django < %{obs_ver} + %description -n python2-django Django is a high-level Python Web framework that encourages rapid development and a clean, pragmatic design. It focuses on automating as @@ -571,6 +572,12 @@ cd tests * Mon Jun 05 2016 Matthias Runge - 1.9.7-1 - bugfix release +* Tue May 31 2016 Nils Philippsen +- fix source URL + +* Sun May 8 2016 Peter Robinson 1.9.6-2 +- Put the provives/obsoletes in the right spot for new python naming + * Tue May 03 2016 Matthias Runge - 1.9.6-1 - update to 1.9.6 (rhbz#1323374)