diff --git a/python-urllib3.changes b/python-urllib3.changes index a86212f..fdd0d6b 100644 --- a/python-urllib3.changes +++ b/python-urllib3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 14 09:35:30 UTC 2015 - toddrme2178@gmail.com + +- 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. + ------------------------------------------------------------------- Tue Oct 6 15:03:05 UTC 2015 - hpj@urpla.net diff --git a/python-urllib3.spec b/python-urllib3.spec index 6281f3c..81ce000 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -66,10 +66,17 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%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}/urllib3-%{version}-py*.egg-info ]; then + rm -rf %{python_sitelib}/urllib3-%{version}-py*.egg-info +fi + %files %defattr(-,root,root,-) %doc CHANGES.rst CONTRIBUTORS.txt LICENSE.txt README.rst %{python_sitelib}/urllib3 -%{python_sitelib}/urllib3-%{version}-py%{py_ver}.egg-info +%{python_sitelib}/urllib3-%{version}-py*.egg-info %changelog