[Django] updated build of docs for F12+

[smilner]

commit a31a71bbb1a74a2458211c82ea6e90505af6d4f1
Author: Steve 'Ashcrow' Milner <stevem at gnulinux.net>
Date:   Sat Oct 9 22:23:13 2010 -0400

    updated build of docs for F12+

 .gitignore  |    1 +
 Django.spec |   16 +++++++++++-----
 sources     |    2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c23f56..75a490b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ Django-hash-compat-13310.patch
 /Django-1.2.2.tar.gz
 /simplejson-init.py
 /Django-1.2.3.tar.gz
+/Django-remove-djangodocs-ext.patch
diff --git a/Django.spec b/Django.spec
index 57f4276..6c70e0a 100644
--- a/Django.spec
+++ b/Django.spec
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@ URL:            http://www.djangoproject.com/
 Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
 # stub simplejson module that imports the system version
 Source1:        simplejson-init.py
+Patch0:         Django-remove-djangodocs-ext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,7 +40,7 @@ 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} > 0 && 0%{?fedora} <= 13
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} >= 12
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -54,6 +55,7 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -78,8 +80,8 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-# If it's rhel5+ or any Fedora under 13 build docs
-%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} <= 13
+# If it's rhel5+ or any Fedora over 12 build docs
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} >= 12
     # build documentation
     (cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,dirhtml} && make dirhtml)
 %endif
@@ -146,7 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------
  
 
-%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} <= 13
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} >= 12
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/dirhtml/*
@@ -154,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct  9 2010 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.2.3-3
+- Now build docs for F12+
+- Added Django-remove-djangodocs-ext.patch
+
 * Sat Oct  9 2010 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.2.3-2
 - Moved to dirhtml for documentation generation
 
diff --git a/sources b/sources
index 5ccbadc..4f365c5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-10bfb5831bcb4d3b1e6298d0e41d6603  Django-1.2.3.tar.gz
 5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
+2b8022ff49f8538962b88d2d87c8be25  Django-remove-djangodocs-ext.patch