Hello community, here is the log from the commit of package python-django for openSUSE:Factory checked in at Fri Mar 25 14:46:25 CET 2011.
-------- --- python-django/python-django.changes 2011-03-03 10:49:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-django/python-django.changes 2011-03-23 12:49:14.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Mar 23 11:39:53 UTC 2011 - [email protected] + +- Update to 1.3 final; +- Refresh patch empty-ip-2.diff. + +------------------------------------------------------------------- +Fri Mar 18 03:45:45 UTC 2011 - [email protected] + +- Update to 1.3-rc1; +- Regenerated spec file with py2pack; +- No more need to fix wrong line endings; +- Refresh patch empty-ip-2.diff with -p0. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Django-1.2.5.tar.bz2 New: ---- Django-1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django.spec ++++++ --- /var/tmp/diff_new_pack.FAlRMW/_old 2011-03-25 14:43:02.000000000 +0100 +++ /var/tmp/diff_new_pack.FAlRMW/_new 2011-03-25 14:43:02.000000000 +0100 @@ -20,13 +20,15 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Name: python-django -Version: 1.2.5 -Release: 6 -License: BSD +%define mod_name django + +Name: python-%{mod_name} +Version: 1.3 +Release: 1 +Url: http://www.djangoproject.com/ Summary: A high-level Python Web framework -Url: http://www.djangoproject.com -Group: Development/Libraries/Python +License: BSD +Group: Development/Languages/Python Source: Django-%{version}.tar.bz2 Source1: python-django-rpmlintrc # PATCH-FIX-UPSTREAM Django-1.2-completion-only-for-bash.patch @@ -35,19 +37,10 @@ Patch2: empty-ip-2.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: dos2unix Requires: python-xml Requires: gettext-tools -%define py_vers %(%{__python} -c 'import sys; print int(10*float(sys.version[:3]))') -%if %{py_vers} < 26 -Requires: python-sqlite2 -%endif %if 0%{?suse_version} %py_requires -%if 0%{?suse_version} > 1010 -BuildRequires: fdupes -%endif %if 0%{?suse_version} > 1110 BuildArch: noarch %endif @@ -58,28 +51,29 @@ %prep %setup -q -n Django-%{version} -%patch1 -p1 -%patch2 -p1 -find . -name admindocs.txt -print0 | xargs -0 dos2unix # fix wrong line endings +%patch1 +%patch2 %build export CFLAGS="%{optflags}" -%{__python} setup.py build +python setup.py build %install -%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=%{buildroot} %{__install} -d %{buildroot}%{_sysconfdir}/bash_completion.d %{__install} -m 0755 extras/django_bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/django_bash_completion.sh -%if 0%{?suse_version} > 1010 -%fdupes %{buildroot} -%endif %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} -%files -f INSTALLED_FILES -%defattr(-,root,root) -%doc AUTHORS LICENSE README docs +%files +%defattr(-,root,root,-) +# You may have to add additional files here (documentation and binaries mostly) +%python_sitelib/%{mod_name}* +%if 0%{?sles_version} != 10 +%python_sitelib/*.egg-info +%endif +%{_bindir}/django-admin.py %{_sysconfdir}/bash_completion.d/django_bash_completion.sh %changelog ++++++ Django-1.2-completion-only-for-bash.patch ++++++ --- /var/tmp/diff_new_pack.FAlRMW/_old 2011-03-25 14:43:02.000000000 +0100 +++ /var/tmp/diff_new_pack.FAlRMW/_new 2011-03-25 14:43:02.000000000 +0100 @@ -1,7 +1,7 @@ -Index: Django-1.2-beta-1/extras/django_bash_completion +Index: extras/django_bash_completion =================================================================== ---- Django-1.2-beta-1.orig/extras/django_bash_completion -+++ Django-1.2-beta-1/extras/django_bash_completion +--- extras/django_bash_completion.orig ++++ extras/django_bash_completion @@ -31,6 +31,8 @@ # # To uninstall, just remove the line from your .bash_profile and .bashrc. ++++++ Django-1.2.5.tar.bz2 -> Django-1.3.tar.bz2 ++++++ ++++ 719344 lines of diff (skipped) ++++++ empty-ip-2.diff ++++++ --- /var/tmp/diff_new_pack.FAlRMW/_old 2011-03-25 14:43:05.000000000 +0100 +++ /var/tmp/diff_new_pack.FAlRMW/_new 2011-03-25 14:43:05.000000000 +0100 @@ -1,11 +1,11 @@ Empty ipaddress raises an error (invalid input syntax for type inet: "") http://code.djangoproject.com/ticket/5622 -Index: Django-1.2.1/django/db/models/fields/__init__.py +Index: django/db/models/fields/__init__.py =================================================================== ---- Django-1.2.1.orig/django/db/models/fields/__init__.py -+++ Django-1.2.1/django/db/models/fields/__init__.py -@@ -898,6 +898,11 @@ class IPAddressField(Field): +--- django/db/models/fields/__init__.py.orig ++++ django/db/models/fields/__init__.py +@@ -917,6 +917,11 @@ class IPAddressField(Field): kwargs['max_length'] = 15 Field.__init__(self, *args, **kwargs) @@ -17,10 +17,10 @@ def get_internal_type(self): return "IPAddressField" -Index: Django-1.2.1/tests/regressiontests/model_fields/models.py +Index: tests/regressiontests/model_fields/models.py =================================================================== ---- Django-1.2.1.orig/tests/regressiontests/model_fields/models.py -+++ Django-1.2.1/tests/regressiontests/model_fields/models.py +--- tests/regressiontests/model_fields/models.py.orig ++++ tests/regressiontests/model_fields/models.py @@ -66,6 +66,9 @@ class BooleanModel(models.Model): bfield = models.BooleanField() string = models.CharField(max_length=10, default='abc') @@ -29,26 +29,31 @@ + ip = models.IPAddressField(blank=True, null=True) + ############################################################################### - # ImageField + # FileField -Index: Django-1.2.1/tests/regressiontests/model_fields/tests.py +Index: tests/regressiontests/model_fields/tests.py =================================================================== ---- Django-1.2.1.orig/tests/regressiontests/model_fields/tests.py -+++ Django-1.2.1/tests/regressiontests/model_fields/tests.py -@@ -7,7 +7,7 @@ from django import forms - from django.db import models - from django.core.exceptions import ValidationError +--- tests/regressiontests/model_fields/tests.py.orig ++++ tests/regressiontests/model_fields/tests.py +@@ -1,3 +1,4 @@ ++ + import datetime + from decimal import Decimal + +@@ -8,7 +9,7 @@ from django.db import models + from django.db.models.fields.files import FieldFile + from django.utils import unittest --from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel -+from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel, IP +-from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel, Document ++from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel, Document, IP # If PIL available, do these tests. if Image: -@@ -214,6 +214,14 @@ class SlugFieldTests(django.test.TestCas +@@ -215,6 +216,14 @@ class SlugFieldTests(test.TestCase): bs = BigS.objects.get(pk=bs.pk) self.assertEqual(bs.s, 'slug'*50) -+class IPFieldTests(django.test.TestCase): ++class IPFieldTests(test.TestCase): + def test_ip_empty(self): + """ + Check it's possible to use empty values in IP field (#5622). @@ -57,5 +62,5 @@ + ip = IP.objects.get(pk=ip.pk) + self.assertEqual(ip.ip, None) - class ValidationTest(django.test.TestCase): + class ValidationTest(test.TestCase): def test_charfield_raises_error_on_empty_string(self): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
