rpms/Django/F-8 .cvsignore, 1.5, 1.6 Django.spec, 1.8, 1.9 sources, 1.5, 1.6

[Michel Alexandre Salim (salimma)]

Author: salimma

Update of /cvs/pkgs/rpms/Django/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2725/F-8

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
Django-0.96.2: XSS security update (bz# 447257-60)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Nov 2007 02:55:27 -0000	1.5
+++ .cvsignore	19 May 2008 20:02:18 -0000	1.6
@@ -1 +1 @@
-Django-0.96.1.tar.gz
+Django-0.96.2.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/Django.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Django.spec	2 Nov 2007 03:04:30 -0000	1.8
+++ Django.spec	19 May 2008 20:02:18 -0000	1.9
@@ -4,7 +4,7 @@
 %define mainver 0.96
 
 Name:           Django
-Version:        %{mainver}.1
+Version:        %{mainver}.2
 Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
@@ -26,12 +26,14 @@
 principle.
 
 
-%package docs
+%package doc
 Summary:  Documentation for Django
 Group:    Documentation
 Requires: %{name} = %{version}-%{release}
+Provides:  %{name}-docs = %{version}-%{release}
+Obsoletes: %{name}-docs < %{version}-%{release}
 
-%description docs
+%description doc
 This package contains the documentation for the Django high-level
 Python Web framework.
 
@@ -47,11 +49,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-
-# Documentation
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
-chmod +x examples/manage.py
-mv examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
+# Language files; not under /usr/share, need to be handled manually
+(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | sed -e 's|^.||' | sed -e \
+  's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
+  >> %{name}.lang
 
 # Permission fixes
 pushd $RPM_BUILD_ROOT%{python_sitelib}/django
@@ -64,19 +65,27 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
 %{_bindir}/django-admin.py
 %exclude %{_bindir}/django-admin.py?
 %{python_sitelib}/django
+%if 0%{?fedora} >= 9
+%{python_sitelib}/*.egg-info
+%endif
 
-%files docs
+%files doc
 %defattr(-,root,root,-)
 %doc docs/*
-%{_datadir}/%{name}
 
 %changelog
+* Mon May 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.2-1
+- XSS security update: CVE-2008-2302 (bz# 442757-60)
+
+* Sat Apr  5 2008 Michel Salim <salimma at fedoraproject.org> - 0.96.1-2
+- Package .egg-info file on Fedora >= 9
+
 * Thu Nov  1 2007 Michel Salim <michel.sylvan at gmail.com> 0.96.1-1
 - i18n security update: CVE-2007-5712, bz#357051
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Nov 2007 02:55:27 -0000	1.5
+++ sources	19 May 2008 20:02:18 -0000	1.6
@@ -1 +1 @@
-10aa32e58969c4efeb00ef42ba192b17  Django-0.96.1.tar.gz
+2e39a43b93b50c2ca90bcade26010878  Django-0.96.2.tar.gz