rpms/python-nltk/EL-5 nltk-0.9-use-sys-yaml.patch, NONE, 1.1 python-nltk.spec, 1.4, 1.5

[Michel Alexandre Salim (salimma)]

Author: salimma

Update of /cvs/pkgs/rpms/python-nltk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32074/EL-5

Modified Files:
	python-nltk.spec 
Added Files:
	nltk-0.9-use-sys-yaml.patch 
Log Message:
- Use PyYAML rather than providing own version


nltk-0.9-use-sys-yaml.patch:

--- NEW FILE nltk-0.9-use-sys-yaml.patch ---
--- nltk-0.9/setup.py.use-sys-yaml	2007-09-26 00:19:30.000000000 -0400
+++ nltk-0.9/setup.py	2008-02-23 18:39:50.000000000 -0500
@@ -36,7 +36,7 @@
                 'nltk.tokenize', 'nltk.stem', 'nltk.tag',
                 'nltk.parse', 'nltk.chunk', 'nltk.chat', 'nltk.draw',
                 'nltk.misc', 'nltk.model', 'nltk.cluster',
-                'nltk.sem', 'nltk.wordnet', 'nltk.etree', 'yaml',
+                'nltk.sem', 'nltk.wordnet', 'nltk.etree',
                 'nltk_contrib',
                 'nltk_contrib.bioreader',
                 'nltk_contrib.classifier',


Index: python-nltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nltk/EL-5/python-nltk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-nltk.spec	21 Jan 2008 04:27:53 -0000	1.4
+++ python-nltk.spec	24 Feb 2008 03:32:41 -0000	1.5
@@ -4,21 +4,22 @@
 Name:           python-nltk
 Epoch:          1
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
 License:        GPLv2
 URL:            http://nltk.sf.net/
 Source0:        http://osdn.dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
+Patch0:         nltk-0.9-use-sys-yaml.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
 Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
 Provides:       python-nltk_lite = %{version}-%{release}
 
-BuildRequires:  python-devel, tkinter
-Requires:       numpy, python-matplotlib, tkinter
+BuildRequires:  python-devel tkinter
+Requires:       numpy python-matplotlib tkinter PyYAML
 
 %description
 NLTK is a Python package that simplifies the construction of programs
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q -n nltk-%{version}%{?prerel}
+%patch0 -p1 -b .use-sys-yaml
 
 
 %build
@@ -60,10 +62,15 @@
 %doc LICENSE.txt README.txt
 %{python_sitelib}/nltk
 %{python_sitelib}/nltk_contrib
-%{python_sitelib}/yaml
+%if 0%{?fedora} >= 9
+%{python_sitelib}/nltk-0.9-py2.5.egg-info
+%endif
 
 
 %changelog
+* Sat Feb 23 2008 Michel Salim <michel.sylvan at gmail.com> - 1:0.9-2
+- Use system PyYAML (bug #432329)
+
 * Sun Jan 20 2008 Michel Salim <michel.sylvan at gmail.com> - 1:0.9-1
 - Update to final 0.9
 - Add Epoch to clear upgrade path from (old) 1.4.4