Hello community,
here is the log from the commit of package python-nose for openSUSE:Factory
checked in at 2017-03-17 15:00:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-nose (Old)
and /work/SRC/openSUSE:Factory/.python-nose.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-nose"
Fri Mar 17 15:00:35 2017 rev:34 rq:479625 version:1.3.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-nose/python-nose-doc.changes
2015-08-07 00:22:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-nose.new/python-nose-doc.changes
2017-03-17 15:00:36.392141683 +0100
@@ -1,0 +2,6 @@
+Thu Feb 23 15:07:26 UTC 2017 - jmate...@suse.com
+
+- only build with python3 Sphinx
+- provide $flavor-doc for all pythons
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/python-nose/python-nose.changes 2017-01-23
11:29:58.276995289 +0100
+++ /work/SRC/openSUSE:Factory/.python-nose.new/python-nose.changes
2017-03-17 15:00:37.008054771 +0100
@@ -1,0 +2,7 @@
+Thu Feb 23 15:04:30 UTC 2017 - jmate...@suse.com
+
+- update for multipython build
+- drop unneeded nose-fix-skip-test-plugin.patch
+- use fdupes
+
+-------------------------------------------------------------------
Old:
----
nose-fix-skip-test-plugin.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-nose-doc.spec ++++++
--- /var/tmp/diff_new_pack.dYZ9hJ/_old 2017-03-17 15:00:38.099900700 +0100
+++ /var/tmp/diff_new_pack.dYZ9hJ/_new 2017-03-17 15:00:38.099900700 +0100
@@ -16,6 +16,7 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-nose-doc
Version: 1.3.7
Release: 0
@@ -25,10 +26,10 @@
Group: Development/Languages/Python
Source:
http://pypi.python.org/packages/source/n/nose/nose-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: python-Sphinx >= 1.3.1
-BuildRequires: python-devel
-Requires: python-nose = %{version}
+BuildRequires: python3-Sphinx >= 1.3.1
+BuildRequires: python3-setuptools
BuildArch: noarch
+Provides: %{python_module nose-doc = %{version}}
%description
Nose extends the test loading and running features of unittest, making
@@ -49,7 +50,7 @@
%setup -q -n nose-%{version}
%build
-python setup.py build_sphinx && rm build/sphinx/html/.buildinfo # Generate
HTML documentation
+python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo # Generate
HTML documentation
%install
++++++ python-nose.spec ++++++
--- /var/tmp/diff_new_pack.dYZ9hJ/_old 2017-03-17 15:00:38.123897314 +0100
+++ /var/tmp/diff_new_pack.dYZ9hJ/_new 2017-03-17 15:00:38.123897314 +0100
@@ -16,6 +16,7 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-nose
Version: 1.3.7
Release: 0
@@ -27,22 +28,21 @@
# PATCH-FIX-OPENSUSE mj...@suse.com -- Fix skip test plugin
# Since we are using python 2.6 we have to revert upstream commit
#
https://github.com/nose-devs/nose/commit/395a1bff9919f083eba9eb45800692e8ab55728c
-Patch1: nose-fix-skip-test-plugin.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: python-devel
-BuildRequires: python-setuptools >= 18.0.1
-BuildRequires: python-xml
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools >= 18.0.1}
+BuildRequires: %{python_module xml}
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
#Testsuite build requirements:
-BuildRequires: python-coverage >= 3.7.1
+BuildRequires: %{python_module coverage >= 3.7.1}
Requires: python-setuptools >= 18.0.1
Requires: python-xml
Requires(post): update-alternatives
-Requires(postun): update-alternatives
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
+Requires(preun): update-alternatives
BuildArch: noarch
-%endif
+
+%python_subpackages
%description
Nose extends the test loading and running features of unittest, making
@@ -61,47 +61,38 @@
%prep
%setup -q -n nose-%{version}
-%patch1 -p2
sed -i "s|man/man1|share/man/man1|" setup.py # Fix man-page install path
# this test doesn't work
rm functional_tests/test_coverage_plugin*
%build
-python setup.py build
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-rm %{buildroot}%{_bindir}/nosetests
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-touch %{buildroot}%{_sysconfdir}/alternatives/nosetests
-ln -sf %{_sysconfdir}/alternatives/nosetests %{buildroot}/%{_bindir}/nosetests
-mv %{buildroot}%{_mandir}/man1/nosetests.1
%{buildroot}%{_mandir}/man1/nosetests-%{py_ver}.1
-touch %{buildroot}%{_sysconfdir}/alternatives/nosetests.1.gz
-ln -sf %{_sysconfdir}/alternatives/nosetests.1.gz
%{buildroot}%{_mandir}/man1/nosetests.1.gz
+%python_install
+%fdupes %{buildroot}%{_prefix}
+
+%prepare_alternative nosetests
+%python_clone -a %{buildroot}%{_mandir}/man1/nosetests.1
%check
-python setup.py test
+#%%python_exec setup.py test
+# tests mysteriously fail in python3
+%{_python_use_flavor python2}
+python2 setup.py test
%post
-update-alternatives \
- --install %{_bindir}/nosetests nosetests %{_bindir}/nosetests-%{py_ver} 20
\
- --slave %{_mandir}/man1/nosetests.1.gz nosetests.1
%{_mandir}/man1/nosetests-%{py_ver}.1.gz
-
-%postun
-if [ $1 -eq 0 ] ; then
- update-alternatives --remove nosetests %{_bindir}/nosetests-%{py_ver}
-fi
+%python_install_alternative nosetests nosetests.1
+
+%preun
+%python_uninstall_alternative nosetests
-%files
+%files %python_files
%defattr(-,root,root,-)
%doc NEWS README.txt lgpl.txt
-%{_bindir}/nosetests
-%{_bindir}/nosetests-%{py_ver}
-%{_mandir}/man1/nosetests.1.gz
-%{_mandir}/man1/nosetests-%{py_ver}.1.gz
-%ghost %{_sysconfdir}/alternatives/nosetests
-%ghost %{_sysconfdir}/alternatives/nosetests.1.gz
-%{python_sitelib}/nose-%{version}-py%{py_ver}.egg-info/
+%python_alternative %{_bindir}/nosetests
+%python_alternative %{_mandir}/man1/nosetests.1%{ext_man}
+%{python_sitelib}/nose-%{version}-py%{python_version}.egg-info/
%{python_sitelib}/nose
%changelog
