From dc0cde9671a661278b03f67ee26f38ecc88a1f519e7f21fe29d14bf7b7cca6b5 Mon Sep 17 00:00:00 2001 From: Todd R Date: Tue, 4 Aug 2015 08:41:26 +0000 Subject: [PATCH] Accepting request 320309 from home:dimstar:Factory - 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. OBS-URL: https://build.opensuse.org/request/show/320309 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=37 --- python-six.changes | 7 +++++++ python-six.spec | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/python-six.changes b/python-six.changes index afd93c3..4bdd063 100644 --- a/python-six.changes +++ b/python-six.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 4 07:50:17 UTC 2015 - dimstar@opensuse.org + +- 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 - toddrme2178@gmail.com diff --git a/python-six.spec b/python-six.spec index cbe59d1..0bf1ef1 100644 --- a/python-six.spec +++ b/python-six.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # NOTE(saschpe): git invocation and pythonpath issues with testrepository # enable testing with a build conditional (off by default): %bcond_with test @@ -66,6 +67,13 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} 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) %doc LICENSE README