rpms/Django/devel Django-ignore-pyo-bz-495046.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 Django.spec, 1.23, 1.24 sources, 1.12, 1.13
smilner
smilner at fedoraproject.org
Sun Aug 2 00:35:27 UTC 2009
- Previous message (by thread): rpms/kdeedu/devel kdeedu.spec,1.197,1.198
- Next message (by thread): rpms/bluez/devel .cvsignore, 1.41, 1.42 bluez.spec, 1.84, 1.85 sources, 1.41, 1.42 0001-Add-rfkill-plugin.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: smilner
Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31749
Modified Files:
.cvsignore Django.spec sources
Added Files:
Django-ignore-pyo-bz-495046.patch
Log Message:
Updates for Django-1.1.
Django-ignore-pyo-bz-495046.patch:
base.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE Django-ignore-pyo-bz-495046.patch ---
diff -ur Django-1.1.old/django/core/management/base.py Django-1.1/django/core/management/base.py
--- Django-1.1.old/django/core/management/base.py 2009-08-01 19:57:57.326706120 -0400
+++ Django-1.1/django/core/management/base.py 2009-08-01 19:58:19.706707008 -0400
@@ -398,7 +398,7 @@
if subdir.startswith('.'):
del subdirs[i]
for f in files:
- if f.endswith('.pyc'):
+ if f.endswith('.pyc') or f.endswith('.pyo'):
continue
path_old = os.path.join(d, f)
path_new = os.path.join(top_dir, relative_dir, f.replace('%s_name' % app_or_project, name))
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 29 Jul 2009 20:21:06 -0000 1.12
+++ .cvsignore 2 Aug 2009 00:35:26 -0000 1.13
@@ -1 +1,3 @@
-Django-1.0.3.tar.gz
+Django-1.1.tar.gz
+Django-ignore-pyo-bz-495046.patch
+simplejson-init.py
Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- Django.spec 30 Jul 2009 03:24:04 -0000 1.23
+++ Django.spec 2 Aug 2009 00:35:26 -0000 1.24
@@ -2,8 +2,8 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: Django
-Version: 1.0.3
-Release: 6%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: A high-level Python Web framework
Group: Development/Languages
@@ -12,6 +12,7 @@ URL: http://www.djangoproject
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-ignore-pyo-bz-495046.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -41,6 +42,7 @@ Python Web framework.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
# remove bundled simplejson
cd django/utils/simplejson/
rm -rf *
@@ -56,7 +58,7 @@ cp -p %{SOURCE1} __init__.py
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
# Language files; not under /usr/share, need to be handled manually
-(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | sed -e 's|^.||' | sed -e \
+(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
>> %{name}.lang
@@ -67,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
cp -p docs/man/* $RPM_BUILD_ROOT%{_mandir}/man1/
+# Fix items in %{_bindir}
+mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
%clean
rm -rf $RPM_BUILD_ROOT
@@ -75,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
-%{_bindir}/django-admin.py
+%{_bindir}/django-admin
%{_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
@@ -84,6 +88,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
%{python_sitelib}/django
+# Leaving these since people may want to rebuild on lower dists
%if 0%{?fedora} >= 9
%{python_sitelib}/*.egg-info
%endif
@@ -97,12 +102,19 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_bindir}/django-admin.pyc
%exclude %{_bindir}/django-admin.pyo
%endif
+# -----------------
%files doc
%defattr(-,root,root,-)
%doc docs/_build/html/*
%changelog
+* Sat Aug 1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1
+- Update for Django 1.1 release.
+- Moved /usr/bin/django-admin.py to /usr/bin/django-admin
+- sed macro is now being used
+- Patch for bz#495046 applied.
+
* Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-6
- Attempted combined spec for F12/11/10 and EL5
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 29 Jul 2009 20:21:06 -0000 1.12
+++ sources 2 Aug 2009 00:35:26 -0000 1.13
@@ -1 +1,3 @@
-3c5435b015d8cde602b17a5f0c9873dc Django-1.0.3.tar.gz
+b2d75b4457a39c405fa2b36bf826bf6b Django-1.1.tar.gz
+302eb7b98d32ae67ade4ebdaff3bf361 Django-ignore-pyo-bz-495046.patch
+5fe0cb83b3122ec27d1179cb9a39063b simplejson-init.py
- Previous message (by thread): rpms/kdeedu/devel kdeedu.spec,1.197,1.198
- Next message (by thread): rpms/bluez/devel .cvsignore, 1.41, 1.42 bluez.spec, 1.84, 1.85 sources, 1.41, 1.42 0001-Add-rfkill-plugin.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list