Attachment 868581 Details for Bug 1043637 – removes six 1.3.0 egg-info before initial install

[patch] removes six 1.3.0 egg-info before initial install

0001-Remove-six-1.3.0-.egg-info-if-it-exists-before-initi.patch (text/plain), 2.01 KB, created by Matt Riedemann on 2014-02-27 15:23:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Riedemann

Created: 2014-02-27 15:23:20 UTC

Size: 2.01 KB

patch

obsolete

>From 3d919ed413830c48ffb08dad5ff4780e6e397a29 Mon Sep 17 00:00:00 2001
>From: Matt Riedemann <mriedem@us.ibm.com>
>Date: Thu, 27 Feb 2014 08:34:11 -0600
>Subject: [PATCH] Remove six-1.3.0-*.egg-info if it exists before initial install
>
>Closes-RTC: #178001
>---
> SPECS/python-six.spec |   29 ++++++++++++++++++++++++++++-
> 1 files changed, 28 insertions(+), 1 deletions(-)
>
>diff --git a/SPECS/python-six.spec b/SPECS/python-six.spec
>index 968181b..3f64a9e 100644
>--- a/SPECS/python-six.spec
>+++ b/SPECS/python-six.spec
>@@ -13,7 +13,7 @@
> 
> Name:           python-six
> Version:        1.4.1
>-Release:        3.ibm%{?dist}
>+Release:        4.ibm%{?dist}
> Summary:        Python 2 and 3 compatibility utilities
> 
> Group:          Development/Languages
>@@ -90,6 +90,29 @@ popd
> %endif
> 
> 
>+# NOTE(mriedem): six 1.3.0 installs an egg-info directory which conflicts
>+# with the egg-info file that six 1.4.1 installs, so to avoid install time
>+# or runtime failures with six 1.4.1, remove previous six files in the
>+# python site-packages path. A better way to do this would be to use pip
>+# to uninstall the previous versions if they exist, but pip may not be
>+# on the system so we just brute-force the removal.
>+%pre
>+if [ $1 -eq 1 ] ; then
>+    # Initial installation
>+    echo "INFO: Removing six-1.3.0 egg-info from site-packages if it exists."
>+    rm -rf %{python_sitelib}/six-1.3.0-*.egg-info
>+fi
>+
>+%if 0%{?with_python3}
>+%pre python3-six
>+if [ $1 -eq 1 ] ; then
>+    # Initial installation
>+    echo "INFO: Removing six-1.3.0 egg-info from site-packages if it exists."
>+    rm -rf %{python3_sitelib}/six-1.3.0-*.egg-info
>+fi
>+%endif
>+
>+
> %files
> %defattr(-,root,root,-)
> %doc LICENSE README documentation/index.rst
>@@ -104,6 +127,10 @@ popd
> 
> 
> %changelog
>+* Thu Feb 27 2014 Matt Riedemann <mriedem@us.ibm.com> - 1.4.1-4.ibm
>+- Remove six-1.3.0-*.egg-info if it exists before initial install.
>+- Resolves RTC 178001.
>+
> * Fri Nov 15 2013 Matt Riedemann <mriedem@us.ibm.com> - 1.4.1-3.ibm
> - Disable python 3 builds for Fedora 19 per RTC 172133.
> 
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 1043637: 868581