diff --git a/Django-1.6.1.tar.gz b/Django-1.6.1.tar.gz deleted file mode 100644 index 2950381..0000000 --- a/Django-1.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf011874f54a16e7452e0fe1e7f4ec144b95b47ecf31766c9f1f8cf438f09c06 -size 6608178 diff --git a/Django-1.6.2.tar.gz b/Django-1.6.2.tar.gz new file mode 100644 index 0000000..3a3f565 --- /dev/null +++ b/Django-1.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1b3f8460e936f47846e7c4f80af951eda82a41c253c3a51ff3389863ff1c03a +size 6615116 diff --git a/python-Django.changes b/python-Django.changes index 681c772..50b21bf 100644 --- a/python-Django.changes +++ b/python-Django.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Feb 14 09:32:07 UTC 2014 - speilicke@suse.com + +- Fix update-alternatives + +------------------------------------------------------------------- +Fri Feb 7 08:30:04 UTC 2014 - speilicke@suse.com + +- Update to version 1.6.2: + + Prevented the base geometry object of a prepared geometry to be garbage + collected, which could lead to crash Django (#21662). + + Fixed a crash when executing the changepassword command when the user + object representation contained non-ASCII characters (#21627). + + The collectstatic command will raise an error rather than default to + using the current working directory if STATIC_ROOT is not set. Combined + with the --clear option, the previous behavior could wipe anything + below the current working directory (#21581). + + Fixed mail encoding on Python 3.3.3+ (#21093). + + Fixed an issue where when settings.DATABASES['default']['AUTOCOMMIT'] = False, + the connection wasn’t in autocommit mode but Django pretended it was. + + Fixed a regression in multiple-table inheritance exclude() queries (#21787). + + Added missing items to django.utils.timezone.__all__ (#21880). + + Fixed a field misalignment issue with select_related() and model inheritance (#21413). + + Fixed join promotion for negated AND conditions (#21748). + + Oracle database introspection now works with boolean and float fields (#19884). + + Fixed an issue where lazy objects weren’t actually marked as safe when + passed through mark_safe() and could end up being double-escaped (#21882). + ------------------------------------------------------------------- Tue Feb 4 14:33:40 UTC 2014 - mcihar@suse.cz diff --git a/python-Django.spec b/python-Django.spec index 766e130..923c101 100644 --- a/python-Django.spec +++ b/python-Django.spec @@ -17,7 +17,7 @@ Name: python-Django -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: A high-level Python Web framework License: BSD-3-Clause @@ -53,16 +53,14 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} install -D -m 0644 extras/django_bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/django_bash_completion-%{py_ver}.sh -ln -s %{_sysconfdir}/bash_completion.d/django_bash_completion-%{py_ver}.sh %{buildroot}%{_sysconfdir}/bash_completion.d/django_bash_completion.sh -ln -s %{_bindir}/django-admin.py-%{py_ver} %{buildroot}%{_bindir}/django-admin.py -%fdupes %{buildroot}%{python_sitelib} -%pre -# Since /usr/bin/django-admin.py became ghosted to be used with update-alternatives, we have to get rid -# of the old binary resulting from the non-update-alternativies-ified package: -[[ ! -L %{_bindir}/django-admin.py ]] && rm -f %{_bindir}/django-admin.py -[[ ! -L %{_sysconfdir}/bash_completion.d/django_bash_completion.sh ]] && rm -f %{_sysconfdir}/bash_completion.d/django_bash_completion.sh -exit 0 +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/django-admin.py +ln -sf %{_sysconfdir}/alternatives/django-admin.py %{buildroot}/%{_bindir}/django-admin.py +touch %{buildroot}%{_sysconfdir}/alternatives/django_bash_completion.sh +ln -sf %{_sysconfdir}/alternatives/django_bash_completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d/django_bash_completion.sh + +%fdupes %{buildroot}%{python_sitelib} %post update-alternatives \ @@ -77,14 +75,13 @@ fi %files %defattr(-,root,root,-) %doc AUTHORS LICENSE README.rst -%ghost %{_bindir}/django-admin.py -%if 0%{?suse_version} >= 1230 -%ghost %{_sysconfdir}/alternatives/django-admin.py -%endif +%{_bindir}/django-admin.py %{_bindir}/django-admin.py-%{py_ver} +%ghost %{_sysconfdir}/alternatives/django-admin.py %{python_sitelib}/django %{python_sitelib}/Django-%{version}-py%{py_ver}.egg-info -%ghost %{_sysconfdir}/bash_completion.d/django_bash_completion.sh +%{_sysconfdir}/bash_completion.d/django_bash_completion.sh %{_sysconfdir}/bash_completion.d/django_bash_completion-%{py_ver}.sh +%ghost %{_sysconfdir}/alternatives/django_bash_completion.sh %changelog