pld-builder.new: PLD_Builder/rpm_builder.py - revert

[arekm]

Author: arekm                        Date: Fri Sep 25 07:03:42 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- revert

---- Files affected:
pld-builder.new/PLD_Builder:
   rpm_builder.py (1.108 -> 1.109) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.108 pld-builder.new/PLD_Builder/rpm_builder.py:1.109
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.108	Fri Sep 25 08:57:17 2009
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Fri Sep 25 09:03:37 2009
@@ -173,9 +173,8 @@
                 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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.108&r2=1.109&f=u