- revert

Changed files:
    PLD_Builder/rpm_builder.py -> 1.109

diff --git a/PLD_Builder/rpm_builder.py b/PLD_Builder/rpm_builder.py
index 3ad5ef2df129eba697ee0418deab3466efd33302..a05092f0d6fdc70a0520ed0743c52db91a25d62a 100644 (file)
--- a/PLD_Builder/rpm_builder.py
+++ b/PLD_Builder/rpm_builder.py
@@ -173,9 +173,8 @@ def build_rpm(r, b):
                 max_jobs = max(min(int(os.sysconf('SC_NPROCESSORS_ONLN') * 1.5), config.max_jobs), 1)
                 if r.max_jobs > 0:
                     max_jobs = max(min(config.max_jobs, r.max_jobs), 1)
-                packagedir = "/home/users/builder/rpm/packages/%s" % b.spec[:-5]
-                cmd = "cd rpm/SPECS; TMPDIR=%s nice -n %s rpmbuild -bb --define '_smp_mflags -j%d' --define '_specdir %s' --define '_sourcedir %s' %s %s" % \
-                            (tmpdir, config.nice, max_jobs, packagedir, packagedir, rpmbuild_opt, b.spec)
+                cmd = "cd rpm/SPECS; TMPDIR=%s nice -n %s rpmbuild -bb --define '_smp_mflags -j%d' %s %s" % \
+                            (tmpdir, config.nice, max_jobs, rpmbuild_opt, b.spec)
                 b.log_line("building RPM using: %s" % cmd)
                 begin_time = time.time()
                 res = chroot.run(cmd, logfile = b.logfile)