Attachment 913514 Details for Bug 1106705 – Fix FTBFS with setuptools >= 0.7

[patch] Fix FTBFS with setuptools >= 0.7

Fix-FTBFS-with-setuptools--07-992420-1106705.patch (text/plain), 2.41 KB, created by Yaakov Selkowitz on 2014-06-30 18:07:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-30 18:07:00 UTC

Size: 2.41 KB

patch

obsolete

>From a2b9f67f0ba4404de8b10e9f0d616ac1f781fa14 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Mon, 30 Jun 2014 13:06:32 -0500
>Subject: [PATCH] Fix FTBFS with setuptools >= 0.7 (#992420, #1106705)
>
>---
> goobook-1.3-setuptools07.patch | 21 +++++++++++++++++++++
> goobook.spec                   |  8 +++++++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
> create mode 100644 goobook-1.3-setuptools07.patch
>
>diff --git a/goobook-1.3-setuptools07.patch b/goobook-1.3-setuptools07.patch
>new file mode 100644
>index 0000000..9599814
>--- /dev/null
>+++ b/goobook-1.3-setuptools07.patch
>@@ -0,0 +1,21 @@
>+diff --git a/distribute_setup.py b/distribute_setup.py
>+index 0021336..f82c2da 100644
>+--- a/distribute_setup.py
>++++ b/distribute_setup.py
>+@@ -137,6 +137,16 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
>+     try:
>+         try:
>+             import pkg_resources
>++
>++            # Setuptools 0.7b and later is a suitable (and preferable)
>++            # substitute for any Distribute version.
>++            try:
>++                pkg_resources.require("setuptools>=0.7b")
>++                return
>++            except (pkg_resources.DistributionNotFound,
>++                    pkg_resources.VersionConflict):
>++                pass
>++
>+             if not hasattr(pkg_resources, '_distribute'):
>+                 if not no_fake:
>+                     _fake_setuptools()
>diff --git a/goobook.spec b/goobook.spec
>index 91921e6..321d6d1 100644
>--- a/goobook.spec
>+++ b/goobook.spec
>@@ -1,12 +1,14 @@
> Name:		goobook
> Version:	1.3
>-Release:	13%{?dist}
>+Release:	14%{?dist}
> Summary:	Abook-style interface for google contacts for mutt
> 
> Group:		Applications/Internet
> License:	GPLv3
> URL:		http://code.google.com/p/goobook
> Source0:	http://pypi.python.org/packages/source/g/%{name}/%{name}-%{version}.tar.gz
>+# setuptools 0.7 replaces distribute
>+Patch0:		goobook-1.3-setuptools07.patch
> 
> BuildArch:	noarch
> 
>@@ -28,6 +30,7 @@ Goobook is a command-line interface to Google contacts. It includes
> 
> %prep
> %setup -q -n %{name}-%{version}
>+%patch0 -p1
> 
> 
> %build
>@@ -54,6 +57,9 @@ done
> 
> 
> %changelog
>+* Mon Jun 30 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3-14
>+- Fix FTBFS with setuptools >= 0.7 (#992420, #1106705)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-13
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 1106705: 905078 | 905079 | 905080 | 913514