- Make License tag conform to the new Licensing Policy.

- Fix the rst emacs mode (RH BZ 250100)

python-docutils.spec

@@ -4,13 +4,15 @@
 
 Name:           python-%{srcname}
 Version:        0.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
-License:        Public Domain, BSD, Python License, GPL - see COPYING.txt
+# See COPYING.txt for information
+License:        Public Domain and MIT and Python and GPLv2
 URL:            http://docutils.sourceforge.net
 Source0:        http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
+Source1:        http://svn.berlios.de/viewcvs/*checkout*/docutils/trunk/docutils/tools/editors/emacs/rst.el?rev=5335
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:       noarch
 
@@ -59,6 +61,10 @@ file=roman.py
 extradest=%{python_sitelib}
 fullextradest=%{buildroot}/$extradest
 install -D -m 0644 extras/$file $fullextradest/$file
+
+# docutils 0.4 rst.el cannot handle emacs 0.22.  Update to the latest svn
+# copy.  This also clarifies the rst.el license.
+cp %{SOURCE1} tools/editors/rst.el
     
 %clean
 rm -rf %{buildroot}
@@ -72,6 +78,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/roman.*
 
 %changelog
+* Sun Aug 12 2007 Toshio Kuratomi <a.badger@gmail.com> 0.4-5
+- Make License tag conform to the new Licensing Policy.
+- Fix the rst emacs mode (RH BZ 250100)
+
 * Sat Dec 09 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-4
 - Bump and rebuild for python 2.5 in devel.