rpms/Django/EL-5 .cvsignore, 1.13, 1.14 Django.spec, 1.18, 1.19 sources, 1.13, 1.14

[smilner]

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17240

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	17 May 2010 19:09:20 -0000	1.13
+++ .cvsignore	26 May 2010 19:36:02 -0000	1.14
@@ -1 +1 @@
-Django-1.2.tar.gz
+Django-1.2.1.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- Django.spec	17 May 2010 19:09:20 -0000	1.18
+++ Django.spec	26 May 2010 19:36:02 -0000	1.19
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.2
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -23,7 +23,6 @@ BuildRequires: python-sphinx
 %endif
 
 Requires:       python-simplejson
-Provides:       django
 
 
 %description
@@ -32,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
@@ -66,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
@@ -94,11 +93,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 %attr(0755,root,root) %{python_sitelib}/django/conf/project_template/manage.py
 %attr(0755,root,root) %{python_sitelib}/django/contrib/admin/media/js/compress.py
-%attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py
-%attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py
-%attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py
-%attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
-%{python_sitelib}/django/
+%attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py*
+%attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py*
+%attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py*
+%attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py*
+%{python_sitelib}/django/bin/profiling/*
+%{python_sitelib}/django/bin/__init__.py*
+# Include everything but the locale data ...
+%{python_sitelib}/django/db/
+%{python_sitelib}/django/*.py*
+%{python_sitelib}/django/shortcuts/
+%{python_sitelib}/django/utils/
+%{python_sitelib}/django/dispatch/
+%{python_sitelib}/django/template/
+%{python_sitelib}/django/views/
+%{python_sitelib}/django/contrib/
+%{python_sitelib}/django/forms/
+%{python_sitelib}/django/templatetags/ 
+%{python_sitelib}/django/core/
+%{python_sitelib}/django/http/
+%{python_sitelib}/django/middleware/
+%{python_sitelib}/django/test/
+%{python_sitelib}/django/conf/*.py*
+%{python_sitelib}/django/conf/project_template/
+%{python_sitelib}/django/conf/app_template/
+%{python_sitelib}/django/conf/urls/
+%{python_sitelib}/django/conf/locale/*/*.py*
+%{python_sitelib}/django/conf/locale/*.py*
+# Call out the locale data on it's own
 %lang(ar) %{python_sitelib}/django/conf/locale/ar/LC_MESSAGES/djangojs.mo
 %lang(ar) %{python_sitelib}/django/conf/locale/ar/LC_MESSAGES/django.mo
 %lang(bg) %{python_sitelib}/django/conf/locale/bg/LC_MESSAGES/djangojs.mo
@@ -233,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/*
@@ -241,10 +263,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon May 17 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2-1
+* Mon May 25 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2.1-1
 - Update for new release.
 - 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	17 May 2010 19:09:20 -0000	1.13
+++ sources	26 May 2010 19:36:02 -0000	1.14
@@ -1 +1 @@
-98fa833fdabcdd78d00245aead66c174  Django-1.2.tar.gz
+2351efb20f6b7b5d9ce80fa4cb1bd9ca  Django-1.2.1.tar.gz