[python-distutils-extra] * Wed Mar 16 2011 Fabian Affolter <fabian at bernewireless.net> - 2.26-1 - Added patch for DISPLAY supp

[Fabian Affolter]

commit 2e359a6d1f5980f1eb6e1c7785cee09a6a086ed8
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Wed Mar 16 23:49:58 2011 +0100

    * Wed Mar 16 2011 Fabian Affolter <fabian at bernewireless.net> - 2.26-1
    - Added patch for DISPLAY support
    - Updated to new upstream version 2.26

 .gitignore                  |    1 +
 dont_import_gtk.patch       |   14 ++++++++++++++
 python-distutils-extra.spec |   15 ++++++++++++---
 sources                     |    2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca2d30b..ddad950 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 dist-python-distutils-extra-2.19.tar.gz
 /python-distutils-extra-2.22.tar.gz
+/python-distutils-extra-2.26.tar.gz
diff --git a/dont_import_gtk.patch b/dont_import_gtk.patch
new file mode 100644
index 0000000..c9a89b8
--- /dev/null
+++ b/dont_import_gtk.patch
@@ -0,0 +1,14 @@
+--- python-distutils-extra-2.26/DistUtilsExtra/auto.py.orig	2011-03-15 11:47:28.000000000 +0100
++++ python-distutils-extra-2.26/DistUtilsExtra/auto.py	2011-03-16 23:28:18.925716210 +0100
+@@ -340,7 +340,10 @@
+         for node in ast.walk(tree):
+             if isinstance(node, ast.Import):
+                 for alias in node.names:
+-                    if __external_mod(alias.name, attrs):
++                    # do not attempt to test if 'gtk' is an external module
++                    # since doing so will fail if no DISPLAY is available
++                    # e.g. on RPM builders or remote servers without X forwarding
++                    if alias.name == 'gtk' or __external_mod(alias.name, attrs):
+                         imports.add(alias.name)
+             if isinstance(node, ast.ImportFrom):
+                 if __external_mod(node.module, attrs):
diff --git a/python-distutils-extra.spec b/python-distutils-extra.spec
index 6f35d3b..d633f40 100644
--- a/python-distutils-extra.spec
+++ b/python-distutils-extra.spec
@@ -1,12 +1,15 @@
 Name:           python-distutils-extra
-Version:        2.22
-Release:        2%{?dist}
+Version:        2.26
+Release:        1%{?dist}
 Summary:        Integrate more support into Python's distutils 
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            https://launchpad.net/python-distutils-extra
 Source0:        http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+# Support use of distutils-extra on systems without DISPLAY
+# https://bugs.launchpad.net/python-distutils-extra/+bug/735408
+Patch0:         dont_import_gtk.patch
 BuildArch:      noarch
 
 BuildRequires:  python-devel
@@ -19,7 +22,9 @@ scrollkeeper based documentation into Python's distutils.
 
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p1 -b .dont_import_gtk
+
 
 %build
 %{__python} setup.py build
@@ -38,6 +43,10 @@ chmod a+x %{buildroot}%{python_sitelib}/DistUtilsExtra/command/build_extra.py
 
 
 %changelog
+* Wed Mar 16 2011 Fabian Affolter <fabian at bernewireless.net> - 2.26-1
+- Added patch for DISPLAY support
+- Updated to new upstream version 2.26
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index c8d51c0..ecb0fa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c085b71263c37af48824f8a353475181  python-distutils-extra-2.22.tar.gz
+7caded30a45907b5cdb10ac4182846eb  python-distutils-extra-2.26.tar.gz