rpms/Django/devel Django.spec,1.33,1.34

[smilner]

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13622

Modified Files:
	Django.spec 
Log Message:
updated for 1.2.1 release


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- Django.spec	25 May 2010 19:16:51 -0000	1.33
+++ Django.spec	26 May 2010 19:04:12 -0000	1.34
@@ -31,7 +31,7 @@ development and a clean, pragmatic desig
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} < 13
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -65,10 +65,10 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-# If it's rhel5+ or any Fedora build docs
-%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+# If it's rhel5+ or any Fedora under 13 build docs
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} < 13
     # build documentation
-    (cd docs && make html)
+    (cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
 %endif
 
 # install man pages
@@ -255,7 +255,7 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------
  
 
-%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} < 13
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
@@ -268,6 +268,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added lang files per BZ#584866.
 - Changed perms on %%{python_sitelib}/django/contrib/admin/media/js/compress.py
 - Lots of explicit files listed in %%files in order to reduce duplicate file listings
+- Docs are not built on F-13 for now
 
 * Wed Oct 21 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-2
 - Removed po files per BZ#529188.