[Django] Update to 1.3.1 Remove workaround for non-functional -doc generation Deduplicate file listing

Michel Alexandre Salim salimma at fedoraproject.org
Sat Sep 10 15:58:55 UTC 2011 

commit 2dd04b8b45b294159feec28c9fb2082b8478b82e
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Sep 10 17:58:19 2011 +0200

    Update to 1.3.1
    Remove workaround for non-functional -doc generation
    Deduplicate file listing

 .gitignore  |   10 +------
 Django.spec |   89 +++++++++++++++++++++++++++++++++++++++++++----------------
 sources     |    4 +--
 3 files changed, 67 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9e0968..9678788 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1 @@
-Django-1.2.1.tar.gz
-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
-/Django-1.2.4.tar.gz
-/Django-1.2.5.tar.gz
-/Django-1.3.tar.gz
+/Django-1.3.1.tar.gz
diff --git a/Django.spec b/Django.spec
index a39384c..e42e782 100644
--- a/Django.spec
+++ b/Django.spec
@@ -2,35 +2,26 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.3
-Release:        2%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.djangoproject.com/
-Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
+Source0:        http://media.djangoproject.com/releases/1.3/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
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
 BuildRequires:  python-devel
-%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+%if 0%{?rhel} > 4 || 0%{?fedora} > 12
 BuildRequires:  python-sphinx
 %endif
 
-# Temporary workaround for documentary generation problem due to
-# Sphinx 1.0 changes
-# This allows for upgrading from a previous release if -doc is installed
-%if 0%{?fedora} > 13
-Provides:       Django-doc = %{version}-%{release}
-Obsoletes:      Django-doc < %{version}-%{release}
-%endif
-
 Requires:       python-simplejson
 
 
@@ -54,8 +45,7 @@ Python Web framework.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0
+%setup -q
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -69,10 +59,6 @@ cp -p %{SOURCE1} __init__.py
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-# Fix upstream filename mistake
-mv django/conf/locale/es_MX/__init__py django/conf/locale/es_MX/__init__.py
-
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 # Handling locale files
@@ -102,6 +88,12 @@ mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-ad
 # remove .po files
 find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
 
+# Fix permissions
+chmod +x \
+  $RPM_BUILD_ROOT%{python_sitelib}/django/conf/project_template/manage.py \
+  $RPM_BUILD_ROOT%{python_sitelib}/django/contrib/admin/media/js/compress.py \
+  $RPM_BUILD_ROOT%{python_sitelib}/django/bin/profiling/gather_profile_stats.py*
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,15 +104,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS LICENSE README
 %{_bindir}/django-admin
 %{_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/bin/profiling/*
 %{python_sitelib}/django/bin/__init__.py*
 # Include everything but the locale data ...
+%dir %{python_sitelib}/django/
 %{python_sitelib}/django/db/
 %{python_sitelib}/django/*.py*
 %{python_sitelib}/django/shortcuts/
@@ -128,7 +118,54 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/django/dispatch/
 %{python_sitelib}/django/template/
 %{python_sitelib}/django/views/
-%{python_sitelib}/django/contrib/
+%dir %{python_sitelib}/django/contrib/
+%{python_sitelib}/django/contrib/*.py*
+%dir %{python_sitelib}/django/contrib/admin/
+%dir %{python_sitelib}/django/contrib/admindocs/
+%dir %{python_sitelib}/django/contrib/auth/
+%dir %{python_sitelib}/django/contrib/comments/
+%dir %{python_sitelib}/django/contrib/contenttypes/
+%dir %{python_sitelib}/django/contrib/csrf/
+%dir %{python_sitelib}/django/contrib/databrowse/
+%dir %{python_sitelib}/django/contrib/flatpages/
+%dir %{python_sitelib}/django/contrib/formtools/
+%dir %{python_sitelib}/django/contrib/gis/
+%dir %{python_sitelib}/django/contrib/humanize/
+%dir %{python_sitelib}/django/contrib/localflavor/
+%dir %{python_sitelib}/django/contrib/markup/
+%dir %{python_sitelib}/django/contrib/messages/
+%dir %{python_sitelib}/django/contrib/redirects
+%dir %{python_sitelib}/django/contrib/sessions/
+%dir %{python_sitelib}/django/contrib/sitemaps/
+%dir %{python_sitelib}/django/contrib/sites/
+%dir %{python_sitelib}/django/contrib/staticfiles/
+%dir %{python_sitelib}/django/contrib/syndication/
+%dir %{python_sitelib}/django/contrib/webdesign/
+%{python_sitelib}/django/contrib/*/*.py*
+%{python_sitelib}/django/contrib/*/fixtures/
+%{python_sitelib}/django/contrib/*/handlers/
+%{python_sitelib}/django/contrib/*/management/
+%{python_sitelib}/django/contrib/*/media/
+%{python_sitelib}/django/contrib/*/plugins/
+%{python_sitelib}/django/contrib/*/templates/
+%{python_sitelib}/django/contrib/*/templatetags/
+%{python_sitelib}/django/contrib/*/tests/
+%{python_sitelib}/django/contrib/*/views/
+%{python_sitelib}/django/contrib/gis/admin/
+%{python_sitelib}/django/contrib/gis/db/
+%{python_sitelib}/django/contrib/gis/forms/
+%{python_sitelib}/django/contrib/gis/gdal/
+%{python_sitelib}/django/contrib/gis/geometry/
+%{python_sitelib}/django/contrib/gis/geos/
+%{python_sitelib}/django/contrib/gis/maps/
+%{python_sitelib}/django/contrib/gis/sitemaps/
+%{python_sitelib}/django/contrib/gis/utils/
+%{python_sitelib}/django/contrib/localflavor/??/
+%{python_sitelib}/django/contrib/localflavor/generic/
+%{python_sitelib}/django/contrib/localflavor/in_/
+%{python_sitelib}/django/contrib/localflavor/is_/
+%{python_sitelib}/django/contrib/messages/storage/
+%{python_sitelib}/django/contrib/sessions/backends/
 %{python_sitelib}/django/forms/
 %{python_sitelib}/django/templatetags/ 
 %{python_sitelib}/django/core/
@@ -141,7 +178,6 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/django/conf/urls/
 %{python_sitelib}/django/conf/locale/*/*.py*
 %{python_sitelib}/django/conf/locale/*.py*
-%dir %{python_sitelib}/django/
 
 # Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
@@ -163,6 +199,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 10 2011 Michel Salim <salimma at fedoraproject.org> - 1.3.1-1
+- Update to 1.3.1
+- Remove workaround for non-functional -doc generation
+- Deduplicate file listing
+
 * Wed Mar 30 2011 Steve Milner <me at stevemilner.org> - 1.3-2
 - Fix for BZ#693865
 
diff --git a/sources b/sources
index 565b100..ace4bcc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-1b8f76e91c27564708649671f329551f  Django-1.3.tar.gz
-5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
-2b8022ff49f8538962b88d2d87c8be25  Django-remove-djangodocs-ext.patch
+62d8642fd06b9a0bf8544178f8500767  Django-1.3.1.tar.gz

More information about the scm-commits mailing list