Hello community,

here is the log from the commit of package python-six for openSUSE:Factory 
checked in at 2020-03-12 22:58:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-six (Old)
 and      /work/SRC/openSUSE:Factory/.python-six.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-six"

Thu Mar 12 22:58:24 2020 rev:36 rq:783174 version:1.14.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-six/python-six.changes    2020-01-23 
16:12:40.227698290 +0100
+++ /work/SRC/openSUSE:Factory/.python-six.new.3160/python-six.changes  
2020-03-12 22:58:52.615004380 +0100
@@ -1,0 +2,11 @@
+Tue Mar 10 07:53:50 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- Do not cause buildcycle with previous change but rather
+  install the egg-info prepared metadata from the tarball
+
+-------------------------------------------------------------------
+Mon Mar  9 20:54:38 UTC 2020 - Dirk Mueller <dmuel...@suse.com>
+
+- use setuptools for building to support pip 10.x (bsc#1166139)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ python-six.spec ++++++
--- /var/tmp/diff_new_pack.WOl6a9/_old  2020-03-12 22:58:53.183004607 +0100
+++ /var/tmp/diff_new_pack.WOl6a9/_new  2020-03-12 22:58:53.183004607 +0100
@@ -27,6 +27,7 @@
 %bcond_with test
 %define psuffix %{nil}
 %endif
+Name:           python-six%{psuffix}
 Version:        1.14.0
 Release:        0
 Summary:        Python 2 and 3 compatibility utilities
@@ -38,7 +39,6 @@
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
-Name:           python-six%{psuffix}
 %if %{with test}
 BuildRequires:  %{python_module dbm}
 BuildRequires:  %{python_module pytest}
@@ -80,6 +80,11 @@
 %if ! %{with test}
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+# add the setuptools egg-info directory
+%{python_expand rm 
%{buildroot}%{$python_sitelib}/six-%{version}-py%{$python_version}.egg-info
+mkdir -p 
%{buildroot}%{$python_sitelib}/six-%{version}-py%{$python_version}.egg-info/
+cp six.egg-info/* 
%{buildroot}%{$python_sitelib}/six-%{version}-py%{$python_version}.egg-info/
+}
 %endif
 
 %check
@@ -88,10 +93,9 @@
 %endif
 
 %pre
-# boo#1123064 - change back to pre scriptlet - if needed as pretrans, write in 
lua
-# bsc#1057496 - egg-info changed from directory to file
-if [ -d %{python_sitelib}/six-*-py%{python_version}.egg-info ]; then
-    rm -rf %{python_sitelib}/six-*-py%{python_version}.egg-info
+# handle distutils (file) to setuptools transition (directory)
+if [ -f %{python_sitelib}/six-*-py%{python_version}.egg-info ]; then
+    rm -vf %{python_sitelib}/six-*-py%{python_version}.egg-info
 fi
 
 %if !%{with test}


Reply via email to