[python-django] resolve conflicts (rhbz#998640)

[Matthias Runge]

commit 54469588a8f2dacc31f46d0f149ebfc4dac980a9
Author: Matthias Runge <mrunge at redhat.com>
Date:   Tue Aug 20 12:04:51 2013 +0200

    resolve conflicts (rhbz#998640)

 python-django.spec |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/python-django.spec b/python-django.spec
index d26d26b..018c796 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -13,11 +13,11 @@
 
 # one higher than the last Django release, to account for
 # dist tags
-%global         obs_ver 1.4.5-2
+%global         obs_ver 1.4.6-2
 
 Name:           python-django
 Version:        1.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -163,7 +163,9 @@ mv {python2-,}django.lang
 mkdir -p %{buildroot}%{_mandir}/man1/
 cp -p docs/man/* %{buildroot}%{_mandir}/man1/
 %if 0%{?with_python3}
-ln -s django-admin.1.gz %{buildroot}%{_mandir}/man1/python3-django-admin.1.gz
+cp -a %{buildroot}%{_mandir}/man1/django-admin.1 %{buildroot}%{_mandir}/man1/python3-django-admin.1
+cp -a %{buildroot}%{_mandir}/man1/daily_cleanup.1 %{buildroot}%{_mandir}/man1/python3-daily_cleanup.1
+cp -a %{buildroot}%{_mandir}/man1/gather_profile_stats.1 %{buildroot}%{_mandir}/man1/python3-gather_profile_stats.1
 %endif # with_python3
 
 # install bash completion script
@@ -390,7 +392,12 @@ popd
 %doc AUTHORS LICENSE README.rst
 %{_bindir}/python3-django-admin
 # as said before, manpages are owned by both python2 and python3 packages
-%{_mandir}/man1/*
+%exclude %{_mandir}/man1/django-admin.1*
+%exclude %{_mandir}/man1/daily_cleanup.1.*
+%exclude %{_mandir}/man1/gather_profile_stats.1.*
+%{_mandir}/man1/python3-daily_cleanup.1.*
+%{_mandir}/man1/python3-django-admin.1.*
+%{_mandir}/man1/python3-gather_profile_stats.1.*
 %attr(0755,root,root) %{python3_sitelib}/django/bin/*-messages.py*
 %attr(0755,root,root) %{python3_sitelib}/django/bin/daily_cleanup.py*
 %attr(0755,root,root) %{python3_sitelib}/django/bin/django-admin.py*
@@ -592,6 +599,9 @@ popd
 
 
 %changelog
+* Tue Aug 20 2013 Matthias Runge <mrunge at redhat.com> - 1.5.2-2
+- increase obsoletes to 1.4.6-2
+
 * Wed Aug 14 2013 Matthias Runge <mrunge at redhat.com> - 1.5.2-1
 - security related update