Hello community,

here is the log from the commit of package python-six for openSUSE:Factory 
checked in at 2015-08-07 00:23:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-six (Old)
 and      /work/SRC/openSUSE:Factory/.python-six.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-six"

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-six/python-six.changes    2015-04-22 
01:14:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-six.new/python-six.changes       
2015-08-07 00:23:44.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Aug  4 07:50:17 UTC 2015 - [email protected]
+
+- Delete the system egg-info during pre phase: older versions of
+  the package installed it as a directory, the latest update
+  creates a file, and rpm has known issues with replacing this.
+
+-------------------------------------------------------------------
+Wed Jul 29 13:01:56 UTC 2015 - [email protected]
+
+- Make tests conditional to avoid dependency loop.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-six.spec ++++++
--- /var/tmp/diff_new_pack.j7LIDL/_old  2015-08-07 00:23:45.000000000 +0200
+++ /var/tmp/diff_new_pack.j7LIDL/_new  2015-08-07 00:23:45.000000000 +0200
@@ -16,6 +16,10 @@
 #
 
 
+# NOTE(saschpe): git invocation and pythonpath issues with testrepository
+# enable testing with a build conditional (off by default):
+%bcond_with test
+
 Name:           python-six
 Version:        1.9.0
 Release:        0
@@ -26,9 +30,11 @@
 Source:         
http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
+%if %{with test}
 # Test requirements:
 BuildRequires:  python-py
 BuildRequires:  python-pytest
+%endif
 %if 0%{?suse_version} <= 1110
 BuildRequires:  python-argparse
 Requires:       python-argparse
@@ -56,8 +62,17 @@
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
+%if %{with test}
 %check
 python test_six.py
+%endif
+
+%pre
+# previous versions of the package installed .egg-info as a directory,
+# the new update now installs it as a file. Clean out the directory, should it 
exist.
+if [ -d %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info ]; then
+  rm -rf %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info
+fi
 
 %files
 %defattr(-,root,root)


Reply via email to