[Django/el6] Switch to the 'html' doc builder, for easier navigation without a web server (cherry picked from com

[Michel Alexandre Salim]

commit 7116b4509994b9ad9ef354d366ff31848d0d5f70
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Sep 10 20:18:54 2011 +0200

    Switch to the 'html' doc builder, for easier navigation without a web server
    (cherry picked from commit bc5694953a9e95502edbe29e28eff845d82d4567)

 Django.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/Django.spec b/Django.spec
index 019ec98..1b235c1 100644
--- a/Django.spec
+++ b/Django.spec
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -73,14 +73,14 @@ rm -rf $RPM_BUILD_ROOT
 # 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,dirhtml} && make dirhtml)
+    (cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
 %endif
 
 # install man pages
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
 cp -p docs/man/* $RPM_BUILD_ROOT%{_mandir}/man1/
 
-# Fix items in %{_bindir}
+# Fix items in %%{_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
 # remove .po files
@@ -191,13 +191,16 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?rhel} > 4 || 0%{?fedora} >= 12
 %files doc
 %defattr(-,root,root,-)
-%doc docs/_build/dirhtml/*
+%doc docs/_build/html/*
 %endif
 
 
 %changelog
+* Sat Sep 10 2011 Michel Salim <salimma at fedoraproject.org> - 1.2.6-2
+- Switch to the 'html' doc builder, for easier navigation without a web server
+
 * Sat Sep 10 2011 Michel Salim <salimma at fedoraproject.org> - 1.2.6-1
-- Update to 1.3.1
+- Update to 1.2.6
 - Remove workaround for non-functional -doc generation
 - Deduplicate file listing