From afb8716bc6101edb40ae89dfcc5661cfab0646445523f01d2cdd4ce0217af1be Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Mon, 12 Jan 2015 08:49:59 +0000
Subject: [PATCH] Accepting request 280773 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/280773
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Django?expand=0&rev=10
---
 python-Django.changes | 5 +++++
 python-Django.spec    | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/python-Django.changes b/python-Django.changes
index b01bf19..5c5fb6d 100644
--- a/python-Django.changes
+++ b/python-Django.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jan 11 12:49:28 UTC 2015 - p.drouand@gmail.com
+
+- South has been merged in main Django; provide and obsolete it
+
 -------------------------------------------------------------------
 Thu Jan  8 11:04:09 UTC 2015 - tbechtold@suse.com
 
diff --git a/python-Django.spec b/python-Django.spec
index 69d06b4..d927b5f 100644
--- a/python-Django.spec
+++ b/python-Django.spec
@@ -36,6 +36,8 @@ Requires(postun): update-alternatives
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       python-django = %{version}
 Obsoletes:      python-django < %{version}
+Provides:       python-South = %{version}
+Obsoletes:      python-South < %{version}
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %else