]>
Commit | Line | Data |
---|---|---|
572e2465 JK |
1 | diff -dur -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/command/bdist_rpm.py Python-3.5.0/Lib/distutils/command/bdist_rpm.py |
2 | --- Python-3.5.0.orig/Lib/distutils/command/bdist_rpm.py 2015-09-13 13:41:20.000000000 +0200 | |
3 | +++ Python-3.5.0/Lib/distutils/command/bdist_rpm.py 2015-12-03 18:14:59.483958511 +0100 | |
4 | @@ -324,6 +324,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 | @@ -337,7 +347,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 |