package /usr/local/lib64/python2.7/site-packages for locally installed packages

[packages/python.git] / python-bdist_rpm.patch

--- Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py	2015-05-23 18:09:01.000000000 +0200
+++ Python-2.7.10/Lib/distutils/command/bdist_rpm.py	2015-12-03 09:23:08.000000000 +0100
@@ -338,6 +338,16 @@
         if self.rpm3_mode:
             rpm_cmd.extend(['--define',
                              '_topdir %s' % os.path.abspath(self.rpm_base)])
+            rpm_cmd.extend(['--define',
+                             '_specdir %s/SPECS' % os.path.abspath(self.rpm_base)])
+            rpm_cmd.extend(['--define',
+                             '_sourcedir %s/SOURCES' % os.path.abspath(self.rpm_base)])
+            rpm_cmd.extend(['--define',
+                             '_builddir %s/BUILD' % os.path.abspath(self.rpm_base)])
+            rpm_cmd.extend(['--define',
+                             '_rpmdir %s/RPMS' % os.path.abspath(self.rpm_base)])
+            rpm_cmd.extend(['--define',
+                             '_srcrpmdir %s/SRPMS' % os.path.abspath(self.rpm_base)])
         if not self.keep_temp:
             rpm_cmd.append('--clean')
 
@@ -351,7 +361,7 @@
         # list is empty)
         nvr_string = "%{name}-%{version}-%{release}"
         src_rpm = nvr_string + ".src.rpm"
-        non_src_rpm = "%{arch}/" + nvr_string + ".%{arch}.rpm"
+        non_src_rpm = nvr_string + ".%{arch}.rpm"
         q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
             src_rpm, non_src_rpm, spec_path)
 
--- Python-2.7.10.orig/Lib/distutils/tests/test_bdist_rpm.py	2015-05-23 18:09:02.000000000 +0200
+++ Python-2.7.10/Lib/distutils/tests/test_bdist_rpm.py	2015-12-03 09:24:55.000000000 +0100
@@ -48,6 +48,8 @@
                      'the rpm command is not found')
     @unittest.skipIf(find_executable('rpmbuild') is None,
                      'the rpmbuild command is not found')
+    @unittest.skipIf(os.environ.get("WITHIN_PYTHON_RPM_BUILD"),
+                    'building the python rpm')
     def test_quiet(self):
         # let's create a package
         tmp_dir = self.mkdtemp()
@@ -91,6 +93,8 @@
                      'the rpm command is not found')
     @unittest.skipIf(find_executable('rpmbuild') is None,
                      'the rpmbuild command is not found')
+    @unittest.skipIf(os.environ.get("WITHIN_PYTHON_RPM_BUILD"),
+                    'building the python rpm')
     def test_no_optimize_flag(self):
         # let's create a package that brakes bdist_rpm
         tmp_dir = self.mkdtemp()