rpms/Django/EL-6 .cvsignore, 1.14, 1.15 Django.spec, 1.31, 1.32 sources, 1.14, 1.15
smilner
smilner at fedoraproject.org
Wed May 26 19:46:00 UTC 2010
Author: smilner
Update of /cvs/pkgs/rpms/Django/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18609
Modified Files:
.cvsignore Django.spec sources
Log Message:
updated for 1.2.1 release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore 10 Oct 2009 01:28:43 -0000 1.14
+++ .cvsignore 26 May 2010 19:46:00 -0000 1.15
@@ -1,2 +1 @@
-simplejson-init.py
-Django-1.1.1.tar.gz
+Django-1.2.1.tar.gz
Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-6/Django.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- Django.spec 26 Oct 2009 00:04:46 -0000 1.31
+++ Django.spec 26 May 2010 19:46:00 -0000 1.32
@@ -2,8 +2,8 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: Django
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: A high-level Python Web framework
Group: Development/Languages
@@ -24,13 +24,14 @@ BuildRequires: python-sphinx
Requires: python-simplejson
+
%description
Django is a high-level Python Web framework that encourages rapid
development and a clean, pragmatic design. It focuses on automating as
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
@@ -64,9 +65,10 @@ rm -rf $RPM_BUILD_ROOT
's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
>> %{name}.lang
-%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
@@ -79,21 +81,167 @@ mv $RPM_BUILD_ROOT%{_bindir}/django-admi
# remove .po files
find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
+
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.lang
+%files
%defattr(-,root,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/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/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 ...
+%{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
+%lang(bg) %{python_sitelib}/django/conf/locale/bg/LC_MESSAGES/django.mo
+%lang(bn) %{python_sitelib}/django/conf/locale/bn/LC_MESSAGES/djangojs.mo
+%lang(bn) %{python_sitelib}/django/conf/locale/bn/LC_MESSAGES/django.mo
+%lang(bs) %{python_sitelib}/django/conf/locale/bs/LC_MESSAGES/django.mo
+%lang(ca) %{python_sitelib}/django/conf/locale/ca/LC_MESSAGES/djangojs.mo
+%lang(ca) %{python_sitelib}/django/conf/locale/ca/LC_MESSAGES/django.mo
+%lang(cs) %{python_sitelib}/django/conf/locale/cs/LC_MESSAGES/djangojs.mo
+%lang(cs) %{python_sitelib}/django/conf/locale/cs/LC_MESSAGES/django.mo
+%lang(cy) %{python_sitelib}/django/conf/locale/cy/LC_MESSAGES/djangojs.mo
+%lang(cy) %{python_sitelib}/django/conf/locale/cy/LC_MESSAGES/django.mo
+%lang(da) %{python_sitelib}/django/conf/locale/da/LC_MESSAGES/djangojs.mo
+%lang(da) %{python_sitelib}/django/conf/locale/da/LC_MESSAGES/django.mo
+%lang(de) %{python_sitelib}/django/conf/locale/de/LC_MESSAGES/djangojs.mo
+%lang(de) %{python_sitelib}/django/conf/locale/de/LC_MESSAGES/django.mo
+%lang(el) %{python_sitelib}/django/conf/locale/el/LC_MESSAGES/djangojs.mo
+%lang(el) %{python_sitelib}/django/conf/locale/el/LC_MESSAGES/django.mo
+%lang(en) %{python_sitelib}/django/conf/locale/en/LC_MESSAGES/djangojs.mo
+%lang(en) %{python_sitelib}/django/conf/locale/en/LC_MESSAGES/django.mo
+%lang(en_GB) %{python_sitelib}/django/conf/locale/en_GB/LC_MESSAGES/django.mo
+%lang(en_GB) %{python_sitelib}/django/conf/locale/en_GB/LC_MESSAGES/djangojs.mo
+%lang(es) %{python_sitelib}/django/conf/locale/es/LC_MESSAGES/djangojs.mo
+%lang(es) %{python_sitelib}/django/conf/locale/es/LC_MESSAGES/django.mo
+%lang(es_AR) %{python_sitelib}/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo
+%lang(es_AR) %{python_sitelib}/django/conf/locale/es_AR/LC_MESSAGES/django.mo
+%lang(et) %{python_sitelib}/django/conf/locale/et/LC_MESSAGES/djangojs.mo
+%lang(et) %{python_sitelib}/django/conf/locale/et/LC_MESSAGES/django.mo
+%lang(eu) %{python_sitelib}/django/conf/locale/eu/LC_MESSAGES/djangojs.mo
+%lang(eu) %{python_sitelib}/django/conf/locale/eu/LC_MESSAGES/django.mo
+%lang(fa) %{python_sitelib}/django/conf/locale/fa/LC_MESSAGES/djangojs.mo
+%lang(fa) %{python_sitelib}/django/conf/locale/fa/LC_MESSAGES/django.mo
+%lang(fi) %{python_sitelib}/django/conf/locale/fi/LC_MESSAGES/djangojs.mo
+%lang(fi) %{python_sitelib}/django/conf/locale/fi/LC_MESSAGES/django.mo
+%lang(fr) %{python_sitelib}/django/conf/locale/fr/LC_MESSAGES/djangojs.mo
+%lang(fr) %{python_sitelib}/django/conf/locale/fr/LC_MESSAGES/django.mo
+%lang(fy_NL) %{python_sitelib}/django/conf/locale/fy_NL/LC_MESSAGES/djangojs.mo
+%lang(fy_NL) %{python_sitelib}/django/conf/locale/fy_NL/LC_MESSAGES/django.mo
+%lang(ga) %{python_sitelib}/django/conf/locale/ga/LC_MESSAGES/djangojs.mo
+%lang(ga) %{python_sitelib}/django/conf/locale/ga/LC_MESSAGES/django.mo
+%lang(gl) %{python_sitelib}/django/conf/locale/gl/LC_MESSAGES/djangojs.mo
+%lang(gl) %{python_sitelib}/django/conf/locale/gl/LC_MESSAGES/django.mo
+%lang(he) %{python_sitelib}/django/conf/locale/he/LC_MESSAGES/djangojs.mo
+%lang(he) %{python_sitelib}/django/conf/locale/he/LC_MESSAGES/django.mo
+%lang(hi) %{python_sitelib}/django/conf/locale/hi/LC_MESSAGES/djangojs.mo
+%lang(hi) %{python_sitelib}/django/conf/locale/hi/LC_MESSAGES/django.mo
+%lang(hr) %{python_sitelib}/django/conf/locale/hr/LC_MESSAGES/djangojs.mo
+%lang(hr) %{python_sitelib}/django/conf/locale/hr/LC_MESSAGES/django.mo
+%lang(hu) %{python_sitelib}/django/conf/locale/hu/LC_MESSAGES/djangojs.mo
+%lang(hu) %{python_sitelib}/django/conf/locale/hu/LC_MESSAGES/django.mo
+%lang(id) %{python_sitelib}/django/conf/locale/id/LC_MESSAGES/django.mo
+%lang(id) %{python_sitelib}/django/conf/locale/id/LC_MESSAGES/djangojs.mo
+%lang(is) %{python_sitelib}/django/conf/locale/is/LC_MESSAGES/djangojs.mo
+%lang(is) %{python_sitelib}/django/conf/locale/is/LC_MESSAGES/django.mo
+%lang(it) %{python_sitelib}/django/conf/locale/it/LC_MESSAGES/djangojs.mo
+%lang(it) %{python_sitelib}/django/conf/locale/it/LC_MESSAGES/django.mo
+%lang(ja) %{python_sitelib}/django/conf/locale/ja/LC_MESSAGES/djangojs.mo
+%lang(ja) %{python_sitelib}/django/conf/locale/ja/LC_MESSAGES/django.mo
+%lang(ka) %{python_sitelib}/django/conf/locale/ka/LC_MESSAGES/djangojs.mo
+%lang(ka) %{python_sitelib}/django/conf/locale/ka/LC_MESSAGES/django.mo
+%lang(km) %{python_sitelib}/django/conf/locale/km/LC_MESSAGES/djangojs.mo
+%lang(km) %{python_sitelib}/django/conf/locale/km/LC_MESSAGES/django.mo
+%lang(kn) %{python_sitelib}/django/conf/locale/kn/LC_MESSAGES/djangojs.mo
+%lang(kn) %{python_sitelib}/django/conf/locale/kn/LC_MESSAGES/django.mo
+%lang(ko) %{python_sitelib}/django/conf/locale/ko/LC_MESSAGES/djangojs.mo
+%lang(ko) %{python_sitelib}/django/conf/locale/ko/LC_MESSAGES/django.mo
+%lang(lt) %{python_sitelib}/django/conf/locale/lt/LC_MESSAGES/djangojs.mo
+%lang(lt) %{python_sitelib}/django/conf/locale/lt/LC_MESSAGES/django.mo
+%lang(lv) %{python_sitelib}/django/conf/locale/lv/LC_MESSAGES/djangojs.mo
+%lang(lv) %{python_sitelib}/django/conf/locale/lv/LC_MESSAGES/django.mo
+%lang(mk) %{python_sitelib}/django/conf/locale/mk/LC_MESSAGES/djangojs.mo
+%lang(mk) %{python_sitelib}/django/conf/locale/mk/LC_MESSAGES/django.mo
+%lang(mn) %{python_sitelib}/django/conf/locale/mn/LC_MESSAGES/django.mo
+%lang(mn) %{python_sitelib}/django/conf/locale/mn/LC_MESSAGES/djangojs.mo
+%lang(nb) %{python_sitelib}/django/conf/locale/nb/LC_MESSAGES/django.mo
+%lang(nb) %{python_sitelib}/django/conf/locale/nb/LC_MESSAGES/djangojs.mo
+%lang(nl) %{python_sitelib}/django/conf/locale/nl/LC_MESSAGES/djangojs.mo
+%lang(nl) %{python_sitelib}/django/conf/locale/nl/LC_MESSAGES/django.mo
+%lang(nn) %{python_sitelib}/django/conf/locale/nn/LC_MESSAGES/django.mo
+%lang(nn) %{python_sitelib}/django/conf/locale/nn/LC_MESSAGES/djangojs.mo
+%lang(no) %{python_sitelib}/django/conf/locale/no/LC_MESSAGES/djangojs.mo
+%lang(no) %{python_sitelib}/django/conf/locale/no/LC_MESSAGES/django.mo
+%lang(pl) %{python_sitelib}/django/conf/locale/pl/LC_MESSAGES/djangojs.mo
+%lang(pl) %{python_sitelib}/django/conf/locale/pl/LC_MESSAGES/django.mo
+%lang(pt) %{python_sitelib}/django/conf/locale/pt/LC_MESSAGES/djangojs.mo
+%lang(pt) %{python_sitelib}/django/conf/locale/pt/LC_MESSAGES/django.mo
+%lang(pt_BR) %{python_sitelib}/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo
+%lang(pt_BR) %{python_sitelib}/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
+%lang(ro) %{python_sitelib}/django/conf/locale/ro/LC_MESSAGES/djangojs.mo
+%lang(ro) %{python_sitelib}/django/conf/locale/ro/LC_MESSAGES/django.mo
+%lang(rt_Latn) %{python_sitelib}/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo
+%lang(rt_Latn) %{python_sitelib}/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
+%lang(ru) %{python_sitelib}/django/conf/locale/ru/LC_MESSAGES/djangojs.mo
+%lang(ru) %{python_sitelib}/django/conf/locale/ru/LC_MESSAGES/django.mo
+%lang(sk) %{python_sitelib}/django/conf/locale/sk/LC_MESSAGES/djangojs.mo
+%lang(sk) %{python_sitelib}/django/conf/locale/sk/LC_MESSAGES/django.mo
+%lang(sl) %{python_sitelib}/django/conf/locale/sl/LC_MESSAGES/djangojs.mo
+%lang(sl) %{python_sitelib}/django/conf/locale/sl/LC_MESSAGES/django.mo
+%lang(sq) %{python_sitelib}/django/conf/locale/sq/LC_MESSAGES/djangojs.mo
+%lang(sq) %{python_sitelib}/django/conf/locale/sq/LC_MESSAGES/django.mo
+%lang(sr) %{python_sitelib}/django/conf/locale/sr/LC_MESSAGES/djangojs.mo
+%lang(sr) %{python_sitelib}/django/conf/locale/sr/LC_MESSAGES/django.mo
+%lang(sv) %{python_sitelib}/django/conf/locale/sv/LC_MESSAGES/djangojs.mo
+%lang(sv) %{python_sitelib}/django/conf/locale/sv/LC_MESSAGES/django.mo
+%lang(ta) %{python_sitelib}/django/conf/locale/ta/LC_MESSAGES/djangojs.mo
+%lang(ta) %{python_sitelib}/django/conf/locale/ta/LC_MESSAGES/django.mo
+%lang(te) %{python_sitelib}/django/conf/locale/te/LC_MESSAGES/djangojs.mo
+%lang(te) %{python_sitelib}/django/conf/locale/te/LC_MESSAGES/django.mo
+%lang(th) %{python_sitelib}/django/conf/locale/th/LC_MESSAGES/djangojs.mo
+%lang(th) %{python_sitelib}/django/conf/locale/th/LC_MESSAGES/django.mo
+%lang(tr) %{python_sitelib}/django/conf/locale/tr/LC_MESSAGES/djangojs.mo
+%lang(tr) %{python_sitelib}/django/conf/locale/tr/LC_MESSAGES/django.mo
+%lang(uk) %{python_sitelib}/django/conf/locale/uk/LC_MESSAGES/djangojs.mo
+%lang(uk) %{python_sitelib}/django/conf/locale/uk/LC_MESSAGES/django.mo
+%lang(vi) %{python_sitelib}/django/conf/locale/vi/LC_MESSAGES/django.mo
+%lang(vi) %{python_sitelib}/django/conf/locale/vi/LC_MESSAGES/djangojs.mo
+%lang(zh_CN) %{python_sitelib}/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
+%lang(zh_CN) %{python_sitelib}/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
+%lang(zh_TW) %{python_sitelib}/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo
+%lang(zh_TW) %{python_sitelib}/django/conf/locale/zh_TW/LC_MESSAGES/django.mo
# Leaving these since people may want to rebuild on lower dists
%if 0%{?fedora} >= 9
@@ -107,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/*
@@ -115,6 +263,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* 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-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources 10 Oct 2009 01:28:43 -0000 1.14
+++ sources 26 May 2010 19:46:00 -0000 1.15
@@ -1,2 +1 @@
-5fe0cb83b3122ec27d1179cb9a39063b simplejson-init.py
-d7839c192e115f9c4dd8777de24dc21c Django-1.1.1.tar.gz
+2351efb20f6b7b5d9ce80fa4cb1bd9ca Django-1.2.1.tar.gz
More information about the scm-commits
mailing list