[Django/f17] update to 1.4.5 to fix CVE-2013-0305, CVE-2013-0306

[Matthias Runge]

commit fbf55aae079b23369756fdfba5b1228c9dda6414
Author: Matthias Runge <mrunge at redhat.com>
Date:   Thu Feb 21 10:49:05 2013 +0100

    update to 1.4.5 to fix CVE-2013-0305, CVE-2013-0306

 .gitignore  |    1 +
 Django.spec |   42 +++++++++++-------------------------------
 sources     |    2 +-
 3 files changed, 13 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31d5f29..bd6c66a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /Django-1.4.1.tar.gz
 /Django-1.4.2.tar.gz
 /Django-1.4.3.tar.gz
+/Django-1.4.5.tar.gz
diff --git a/Django.spec b/Django.spec
index 9496e8f..d0eb5f4 100644
--- a/Django.spec
+++ b/Django.spec
@@ -7,7 +7,7 @@
 %bcond_with internet
 
 Name:           Django
-Version:        1.4.3
+Version:        1.4.5
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -22,20 +22,12 @@ Patch0:         Django-1.4-no-internet-connection-tests.patch
 Patch1:         Django-1.4-relax-scalability-req.patch
 
 
-%if 0%{?rhel} <= 5
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%endif
-
 BuildArch:      noarch
-# Note: No longer required in development version > 0.95
-# BuildRequires:  python-setuptools
-BuildRequires:  python-devel
-%if 0%{?rhel} > 4 || 0%{?fedora} > 12
+BuildRequires:  python2-devel
 BuildRequires:  python-sphinx
-%endif
+
 # for testing
 BuildRequires:  python-simplejson
-
 Requires:       python-simplejson
 
 
@@ -45,7 +37,6 @@ development and a clean, pragmatic design. It focuses on automating as
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-%if 0%{?rhel} > 4 || 0%{?fedora} >= 12
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -55,7 +46,6 @@ Provides:       %{name}-docs = %{version}-%{release}
 %description doc
 This package contains the documentation for the Django high-level
 Python Web framework.
-%endif
 
 %prep
 %setup -q 
@@ -89,7 +79,6 @@ cp -p %{SOURCE1} __init__.py
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 %if 0%{?rhel} > 6 || 0%{?fedora} >= 16
@@ -112,11 +101,10 @@ cat djangojs.lang >> django.lang
       >> django.lang
 %endif
 
-# If it's rhel5+ or any Fedora over 12 build docs
-%if 0%{?rhel} > 4 || 0%{?fedora} >= 12
-    # build documentation
-    (cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
-%endif
+
+# build documentation
+(cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
+
 
 
 # install man pages
@@ -146,13 +134,9 @@ export LANG=en_US.utf8
 cd tests
 ./runtests.py --settings=test_sqlite
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files -f django.lang
-%defattr(-,root,root,-)
-%doc AUTHORS LICENSE README
+%doc AUTHORS LICENSE README django/contrib/admin/static/admin/js/LICENSE-JQUERY.txt
 %{_bindir}/django-admin
 %{_mandir}/man1/*
 %attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py*
@@ -239,21 +223,17 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} > 0 && 0%{?fedora} <= 9
-%ghost %{_bindir}/django-admin.pyc
-%ghost %{_bindir}/django-admin.pyo
-%endif
 # -----------------
  
 
-%if 0%{?rhel} > 4 || 0%{?fedora} >= 12
 %files doc
-%defattr(-,root,root,-)
 %doc docs/_build/html/*
-%endif
 
 
 %changelog
+* Thu Feb 21 2013 Matthias Runge <mrunge at redhat.com> - 1.4.5-1
+- update fix CVE-2013-0305, CVE-2013-0306
+
 * Tue Dec 11 2012 Matthias Runge <mrunge at redhat.com> - 1.4.3-1
 - security update to upstream version 1.4.3
   https://www.djangoproject.com/weblog/2012/dec/10/security/
diff --git a/sources b/sources
index 13d9030..c054261 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b134c44b6dc8eb36822677ef506c9ab  Django-1.4.3.tar.gz
+851d00905eb70e4aa6384b3b8b111fb7  Django-1.4.5.tar.gz