rpms/Django/F-12 Django.spec,1.34,1.35

Wed Jun 9 16:27:07 UTC 2010

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21774

Modified Files:
	Django.spec 
Log Message:
pulled devel spec


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-12/Django.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35

--- Django.spec	2 Jun 2010 15:35:53 -0000	1.34
+++ Django.spec	9 Jun 2010 16:27:07 -0000	1.35
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        5%{?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-hash-compat-13310.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -19,7 +20,15 @@ BuildArch:      noarch
 # BuildRequires:  python-setuptools
 BuildRequires:  python-devel
 %if 0%{?rhel} > 4 || 0%{?fedora} > 0
-BuildRequires: python-sphinx
+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
@@ -46,6 +55,7 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p3
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -60,7 +70,12 @@ cp -p %{SOURCE1} __init__.py
 %install
 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
+# Handling locale files
+# This is adapted from the %%find_lang macro, which cannot be directly
+# used since Django locale files are not located in %%{_datadir}
+#
+# The rest of the packaging guideline still apply -- do not list
+# locale files by hand!
 (cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
@@ -86,7 +101,7 @@ find $RPM_BUILD_ROOT -name "*.po" | xarg
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
 %{_bindir}/django-admin
@@ -120,131 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{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
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
 %{python_sitelib}/*.egg-info
 %endif
 
@@ -263,6 +156,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun  8 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2.1-5
+- Added http://code.djangoproject.com/changeset/13310?format=diff&new=13310 per BZ#601212
+
+* Thu Jun  3 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2.1-4
+- Include egg in >= rhel6
+
+* Thu Jun  3 2010 Michel Salim <salimma at fedoraproject.org> - 1.2.1-3
+- Use generated %%{name}.lang instead of including each locale file by hand
+- Temporarily make main package provide -doc on Rawhide, to fix upgrade path
+  until upstream documentation builds with Sphinx 1.0
+
 * Thu May 27 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2.1-2
 - Allow for building docs in F13 as it's only F14 freaking out
 

