[python] 2.7.3-34: restrict scope of workaround for cmpi-bindings issue (rhbz#817554)

[dmalcolm]

commit 1b2a274a94e296f929715acd189bbe6c028861b1
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Wed Mar 6 16:38:05 2013 -0500

    2.7.3-34: restrict scope of workaround for cmpi-bindings issue (rhbz#817554)
    
    * Wed Mar  6 2013 David Malcolm <dmalcolm at redhat.com> - 2.7.3-34
    - restrict scope of workaround for cmpi-bindings issue to avoid breaking
    in-tree running of test_sys and test_subprocess (rhbz#817554)

 00174-fix-for-usr-move.patch |    4 ++--
 python.spec                  |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/00174-fix-for-usr-move.patch b/00174-fix-for-usr-move.patch
index 640986e..b48dc5c 100644
--- a/00174-fix-for-usr-move.patch
+++ b/00174-fix-for-usr-move.patch
@@ -1,6 +1,6 @@
 diff -up Python-2.7.3/Modules/getpath.c.fix-for-usr-move Python-2.7.3/Modules/getpath.c
 --- Python-2.7.3/Modules/getpath.c.fix-for-usr-move	2013-03-06 14:25:32.801828698 -0500
-+++ Python-2.7.3/Modules/getpath.c	2013-03-06 14:59:05.399691078 -0500
++++ Python-2.7.3/Modules/getpath.c	2013-03-06 15:59:30.872443168 -0500
 @@ -510,6 +510,24 @@ calculate_path(void)
         MAXPATHLEN bytes long.
      */
@@ -11,7 +11,7 @@ diff -up Python-2.7.3/Modules/getpath.c.fix-for-usr-move Python-2.7.3/Modules/ge
 +      "/lib[64]/python2.7/os.py" via the /lib -> /usr/lib symlink for
 +      https://fedoraproject.org/wiki/Features/UsrMove
 +    */
-+    if (argv0_path[0] == '\0') {
++    if (argv0_path[0] == '\0' && 0 == strcmp(prog, "cmpi_swig")) {
 +        /*
 +          We have an empty argv0_path, presumably because prog aka
 +          Py_GetProgramName() was not found on $PATH.
diff --git a/python.spec b/python.spec
index 15081d3..536f2e9 100644
--- a/python.spec
+++ b/python.spec
@@ -106,7 +106,7 @@ Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 # Remember to also rebase python-docs when changing this:
 Version: 2.7.3
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: Python
 Group: Development/Languages
 Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@ -1992,6 +1992,10 @@ rm -fr %{buildroot}
 # ======================================================
 
 %changelog
+* Wed Mar  6 2013 David Malcolm <dmalcolm at redhat.com> - 2.7.3-34
+- restrict scope of workaround for cmpi-bindings issue to avoid breaking
+in-tree running of test_sys and test_subprocess (rhbz#817554)
+
 * Wed Mar  6 2013 David Malcolm <dmalcolm at redhat.com> - 2.7.3-33
 - add workaround for cmpi-bindings issue (rhbz#817554)