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
This commit is contained in:
Todd R 2015-08-04 08:41:26 +00:00 committed by Git OBS Bridge
parent 277dadddc6
commit dc0cde9671
2 changed files with 15 additions and 0 deletions

View File

@ -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 Wed Jul 29 13:01:56 UTC 2015 - toddrme2178@gmail.com

View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# NOTE(saschpe): git invocation and pythonpath issues with testrepository # NOTE(saschpe): git invocation and pythonpath issues with testrepository
# enable testing with a build conditional (off by default): # enable testing with a build conditional (off by default):
%bcond_with test %bcond_with test
@ -66,6 +67,13 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
python test_six.py python test_six.py
%endif %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 %files
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE README %doc LICENSE README