From 6661767b81273daa4504c424c79943b26f560863 Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fis.ucm.es>
Date: Jun 24 2014 16:26:37 +0000
Subject: Add COPYING to docs


- Spec cleanup

---

diff --git a/python-scikit-learn.spec b/python-scikit-learn.spec
index 2c9263b..71ea85b 100644
--- a/python-scikit-learn.spec
+++ b/python-scikit-learn.spec
@@ -3,12 +3,9 @@
 
 Name: python-scikit-learn
 Version: 0.15.0
-Release: 0.3.b1%{?dist}
+Release: 0.4.b1%{?dist}
 Summary: Machine learning in Python
 License: BSD
-# No license file
-# https://github.com/scikit-learn/scikit-learn/issues/2422
-# webpage says: BSD (3 clause)
 
 URL: http://scikit-learn.org/
 #Source0: https://pypi.python.org/packages/source/s/scikit-learn/%{upname}-%{version}.tar.gz
@@ -25,7 +22,7 @@ BuildRequires: python-joblib >= 0.8.0
 BuildRequires: python-six >= 1.4.1
 BuildRequires: atlas-devel blas-devel
 BuildRequires: Cython python-pillow
-Requires: numpy scipy python-joblib
+Requires: numpy scipy python-joblib >= 0.8.0
 
 # we don't want to provide private python extension libs
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$
@@ -46,7 +43,7 @@ BuildRequires: python3-joblib >= 0.8.0
 BuildRequires: python3-six >= 1.4.1
 BuildRequires: atlas-devel blas-devel
 BuildRequires: python3-Cython python3-pillow
-Requires: python3-numpy python3-scipy python3-joblib
+Requires: python3-numpy python3-scipy python3-joblib >= 0.8.0
 
 %description -n python3-%{upname}
 Scikit-learn integrates machine learning algorithms in the tightly-knit 
@@ -62,6 +59,7 @@ efficient, accessible to everybody, and reusable in various contexts.
 
 %patch0 -p1
 
+# Code to load system six and joblib at runtime
 mkdir sklearn/externals/bundled
 touch sklearn/externals/bundled/__init__.py
 mv sklearn/externals/six.py sklearn/externals/bundled
@@ -73,23 +71,8 @@ cp %{SOURCE2} sklearn/externals/joblib.py
 
 %patch2 -p1
 rm -rf sklearn/src/cblas
-#%patch3 -p1
-#rm -rf sklearn/datasets/_svmlight_format.c
-#rm -rf *egg-info
-chmod -x examples/decomposition/plot_pca_vs_fa_model_selection.py 
-
-# Reported upstream
-# https://github.com/scikit-learn/scikit-learn/issues/2423
-# Removing bogus shebang
-#pushd sklearn/datasets
-#sed -i -e "1d" setup.py
-#popd
 
-#pushd sklearn/gaussian_process/
-#sed -i -e "1d" gaussian_process.py regression_models.py __init__.py correlation_models.py
-#sed -i -e "1d" regression_models.py __init__.py correlation_models.py
-#sed -i -e "2d" gaussian_process.py 
-#popd
+chmod -x examples/decomposition/plot_pca_vs_fa_model_selection.py 
 
 find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|'
 
@@ -97,15 +80,8 @@ find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|'
 rm -rf %{py3dir}
 cp -a . %{py3dir}
 find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-#pushd %{py3dir}
-#cython3 sklearn/datasets/_svmlight_format.pyx
-#cython3 sklearn/cluster/_k_means.pyx
-#popd
 %endif # with_python3
 
-#cython sklearn/datasets/_svmlight_format.pyx
-#cython sklearn/cluster/_k_means.pyx
-
 %build
 CFLAGS="%{optflags}" %{__python2} setup.py build
 
@@ -138,18 +114,22 @@ pushd %{buildroot}/%{python_sitearch}
 popd
  
 %files
-%doc examples/ AUTHORS.rst README.rst
+%doc examples/ AUTHORS.rst README.rst COPYING
 %{python2_sitearch}/sklearn
 %{python2_sitearch}/scikit_learn-*.egg-info
 
 %if 0%{?with_python3}
 %files -n python3-%{upname}
-%doc examples/ AUTHORS.rst README.rst
+%doc examples/ AUTHORS.rst README.rst COPYING
 %{python3_sitearch}/sklearn
 %{python3_sitearch}/scikit_learn-*.egg-info
 %endif # with_python3
 
 %changelog
+* Tue Jun 24 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.15.0-0.4.b1
+- Add COPYING to docs
+- Spec cleanup
+
 * Mon Jun 23 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.15.0-0.3.b1
 - New upstream (0.15.0b1), beta release 
 - Add tarball