[python-nltk] Update to 2.0.4

[cheeselee]

commit 65a12d6eca50eefcc434dce2a464b49b6000750f
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Wed Dec 12 14:43:42 2012 +0800

    Update to 2.0.4

 .gitignore       |    1 +
 python-nltk.spec |   27 ++++++++++++++-------------
 sources          |    2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2c1f13d..1bb912c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 nltk-2.0b8.tar.gz
 /nltk-2.0b9.tar.gz
 /nltk-2.0.1rc1.tar.gz
+/nltk-2.0.4.tar.gz
diff --git a/python-nltk.spec b/python-nltk.spec
index 4aa71d2..a470396 100644
--- a/python-nltk.spec
+++ b/python-nltk.spec
@@ -1,18 +1,20 @@
-%global prerel rc1
+%global mod_name nltk
 Name:           python-nltk
 Epoch:          1
-Version:        2.0.1
-Release:        0.6.%{prerel}%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://www.nltk.org/
-Source0:        http://nltk.googlecode.com/files/nltk-%{version}%{?prerel}.tar.gz
+Source0:        http://pypi.python.org/packages/source/n/%{mod_name}/%{mod_name}-%{version}.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  python2-devel PyYAML
-Requires:       numpy python-matplotlib PyYAML tkinter
+BuildRequires:  python2-devel >= 2.5
+BuildRequires:  PyYAML >= 3.09
+Requires:       PyYAML >= 3.09
+Requires:       numpy python-matplotlib tkinter
 
 %description
 NLTK is a Python package that simplifies the construction of programs
@@ -24,7 +26,7 @@ research projects.
 
 
 %prep
-%setup -q -n nltk-%{version}%{?prerel}
+%setup -q -n %{mod_name}-%{version}
 
 
 %build
@@ -32,22 +34,21 @@ research projects.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-sed -i -e '/^#! *\//, 1d' $RPM_BUILD_ROOT%{python_sitelib}/nltk/corpus/reader/knbc.py
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+sed -i -e '/^#! *\//, 1d' $RPM_BUILD_ROOT%{python_sitelib}/nltk/corpus/reader/knbc.py \
+                          $RPM_BUILD_ROOT%{python_sitelib}/nltk/test/{runtests,doctest_driver}.py
 
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt README.txt
 %{python_sitelib}/nltk
 %{python_sitelib}/nltk-*.egg-info
 
 
 %changelog
+* Wed Dec 12 2012 Robin Lee <cheeselee at fedoraproject.org> - 1:2.0.4-1
+- Update to 2.0.4
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.0.1-0.6.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index e4426bd..e8627b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d08459c31b0bf875a73cea81eaa2dd4  nltk-2.0.1rc1.tar.gz
+b17aad070ae9a094538e4b481409db09  nltk-2.0.4.tar.gz