From a6749ef4a90072891ee32e98c6cbe81fd384116b Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Mar 30 2016 11:27:23 +0000 Subject: add proper Provides and Obsoletes --- diff --git a/python-scikit-learn.spec b/python-scikit-learn.spec index 890d4f5..e2c8b63 100644 --- a/python-scikit-learn.spec +++ b/python-scikit-learn.spec @@ -11,7 +11,7 @@ in various contexts. Name: python-scikit-learn Version: 0.17.1 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: %{sum} License: BSD @@ -41,10 +41,15 @@ BuildRequires: numpy scipy python2-matplotlib BuildRequires: python2-joblib >= 0.9.4 BuildRequires: python2-six >= 1.4.1 BuildRequires: Cython python2-pillow -Requires: numpy +Requires: numpy Requires: scipy Requires: python2-joblib >= 0.9.4 +Provides: %{name} = %{version}-%{release} +Provides: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: %{name} <= 0.17.1-2 +Obsoletes: %{name}%{?_isa} <= 0.17.1-2 + %description -n python2-%{srcname} %{common_description} @@ -76,7 +81,7 @@ cp %{SOURCE2} sklearn/externals/joblib.py # Remove the source code of the bundled blas library rm -rf sklearn/src/cblas/* -#chmod -x examples/decomposition/plot_pca_vs_fa_model_selection.py +#chmod -x examples/decomposition/plot_pca_vs_fa_model_selection.py #sed -i -e "1d" examples/decomposition/plot_pca_vs_fa_model_selection.py #find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|' @@ -97,9 +102,9 @@ popd pushd %{buildroot}/%{python2_sitearch} # nosetests-%{python2_version} -x sklearn popd - + %files -n python2-%{srcname} -%doc examples/ AUTHORS.rst README.rst +%doc examples/ AUTHORS.rst README.rst %license COPYING %{python2_sitearch}/sklearn %{python2_sitearch}/scikit_learn-*.egg-info @@ -111,6 +116,9 @@ popd %{python3_sitearch}/scikit_learn-*.egg-info %changelog +* Wed Mar 30 2016 Björn Esser - 0.17.1-3 +- add proper Provides and Obsoletes + * Wed Mar 30 2016 Sergio Pascual - 0.17.1-2.1 - Skip tests for the moment @@ -157,14 +165,14 @@ popd - New upstream (0.15.0), final * Wed Jul 02 2014 Sergio Pascual - 0.15.0-0.5.b2 -- New upstream (0.15.0b2), beta release +- New upstream (0.15.0b2), beta release * Tue Jun 24 2014 Sergio Pascual - 0.15.0-0.4.b1 - Add COPYING to docs - Spec cleanup * Mon Jun 23 2014 Sergio Pascual - 0.15.0-0.3.b1 -- New upstream (0.15.0b1), beta release +- New upstream (0.15.0b1), beta release - Add tarball - Disable tests for the moment