[python-django: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django

[Matthias Runge]

commit 18ff3a31207bde22c8d59641dcd5bc2a153ea784
Merge: b2d54f4 8c554f6
Author: Matthias Runge <mrunge at redhat.com>
Date:   Tue Dec 11 09:35:15 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django
    
    Conflicts:
    	python-django.spec

 python-django.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc python-django.spec
index 09fb2a8,3d31f7c..8a8426c
--- a/python-django.spec
+++ b/python-django.spec
@@@ -11,11 -11,11 +11,11 @@@
  
  # one higher than the last Django release, to account for
  # dist tags
- %global         obs_ver 1.4.1-2
+ %global         obs_ver 1.4.2-2
  
  Name:           python-django
 -Version:        1.4.2
 -Release:        2%{?dist}
 +Version:        1.4.3
 +Release:        1%{?dist}
  Summary:        A high-level Python Web framework
  
  Group:          Development/Languages
@@@ -254,10 -255,10 +255,15 @@@ cd test
  
  
  %changelog
++<<<<<<< HEAD
 +* 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/
 +
+ * Fri Nov 16 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1.4.2-2
+ - Bump obsoletes version, since there is still Django-1.4.2-1 out there.
+ - Fix a provide that should allow users to use "django" instead of "Django".
+ 
  * Thu Oct 18 2012 Matthias Runge <mrunge at redhat.com> - 1.4.2-1
  - security update to upstream version 1.4.2-1
    https://www.djangoproject.com/weblog/2012/oct/17/security/