rpms/Django/F-8 simplejson-init.py, NONE, 1.1 .cvsignore, 1.8, 1.9 Django.spec, 1.11, 1.12 sources, 1.8, 1.9

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/Django/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv771/F-8

Modified Files:
	.cvsignore Django.spec sources 
Added Files:
	simplejson-init.py 
Log Message:
* Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.0.2-1
- Update to 1.0.2



--- NEW FILE simplejson-init.py ---
r"""
Stub simplejson library that just imports the version provided by the system
"""

from simplejson import *


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2008 14:14:00 -0000	1.8
+++ .cvsignore	14 Dec 2008 06:23:24 -0000	1.9
@@ -1 +1 @@
-Django-1.0.tar.gz
+Django-1.0.2-final.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/Django.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Django.spec	6 Sep 2008 14:14:00 -0000	1.11
+++ Django.spec	14 Dec 2008 06:23:24 -0000	1.12
@@ -1,23 +1,23 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
-%define mainver 1.0
-
 Name:           Django
-Version:        %{mainver}
+Version:        1.0.2
 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/%{mainver}/Django-%{version}.tar.gz
+Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}-final.tar.gz
+Source1:	simplejson-init.py
 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
+Requires:       python-simplejson
 
 %description
 Django is a high-level Python Web framework that encourages rapid
@@ -39,7 +39,12 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-final
+# remove bundled simplejson
+cd django/utils/simplejson/
+rm -rf *
+# and put the replacement stub in place
+cp -p %{SOURCE1} __init__.py
 
 
 %build
@@ -54,13 +59,10 @@
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-# Permission fixes
-pushd $RPM_BUILD_ROOT%{python_sitelib}/django
-chmod +x conf/project_template/manage.py
-cd bin
-chmod +x profiling/gather_profile_stats.py
-chmod +x {{compile,make,unique}-messages,daily_cleanup,django-admin}.py
-popd
+# install man pages
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
+cp -p docs/man/* $RPM_BUILD_ROOT%{_mandir}/man1/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +72,12 @@
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
 %{_bindir}/django-admin.py
+%{_mandir}/man1/*
+%attr(0755,root,root) %{python_sitelib}/django/conf/project_template/manage.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
 %exclude %{_bindir}/django-admin.py?
 %{python_sitelib}/django
 %if 0%{?fedora} >= 9
@@ -81,6 +89,12 @@
 %doc docs/*
 
 %changelog
+* Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.0.2-1
+- Update to 1.0.2
+
+* Sat Nov  1 2008 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.1-0.1.beta1
+- Update to 1.0.1_beta_1
+
 * Sat Sep  6 2008 Michel Salim <salimma at fedoraproject.org> - 1.0-1
 - Update to final 1.0 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Sep 2008 14:14:00 -0000	1.8
+++ sources	14 Dec 2008 06:23:24 -0000	1.9
@@ -1 +1 @@
-84d0490e4126f31d1c23f640e1e86f2f  Django-1.0.tar.gz
+89353e3749668778f1370d2e444f3adc  Django-1.0.2-final.tar.gz