]> git.pld-linux.org Git - packages/python.git/blob - python-bdist_rpm.patch
fix distutils test failing on bdist_rpm
[packages/python.git] / python-bdist_rpm.patch
1 diff -dur Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py Python-2.7.10/Lib/distutils/command/bdist_rpm.py
2 --- Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py       2015-05-23 18:09:01.000000000 +0200
3 +++ Python-2.7.10/Lib/distutils/command/bdist_rpm.py    2015-12-02 21:32:28.137323794 +0100
4 @@ -338,6 +338,16 @@
5          if self.rpm3_mode:
6              rpm_cmd.extend(['--define',
7                               '_topdir %s' % os.path.abspath(self.rpm_base)])
8 +            rpm_cmd.extend(['--define',
9 +                             '_specdir %s/SPECS' % os.path.abspath(self.rpm_base)])
10 +            rpm_cmd.extend(['--define',
11 +                             '_sourcedir %s/SOURCES' % os.path.abspath(self.rpm_base)])
12 +            rpm_cmd.extend(['--define',
13 +                             '_builddir %s/BUILD' % os.path.abspath(self.rpm_base)])
14 +            rpm_cmd.extend(['--define',
15 +                             '_rpmdir %s/RPMS' % os.path.abspath(self.rpm_base)])
16 +            rpm_cmd.extend(['--define',
17 +                             '_srcrpmdir %s/SRPMS' % os.path.abspath(self.rpm_base)])
18          if not self.keep_temp:
19              rpm_cmd.append('--clean')
20  
21 @@ -351,7 +361,7 @@
22          # list is empty)
23          nvr_string = "%{name}-%{version}-%{release}"
24          src_rpm = nvr_string + ".src.rpm"
25 -        non_src_rpm = "%{arch}/" + nvr_string + ".%{arch}.rpm"
26 +        non_src_rpm = nvr_string + ".%{arch}.rpm"
27          q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
28              src_rpm, non_src_rpm, spec_path)
29  
This page took 0.042457 seconds and 3 git commands to generate.