pld-builder.new: PLD_Builder/srpm_builder.py - adjust for new cvs layout

[arekm]

Author: arekm                        Date: Tue Apr 28 13:10:25 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- adjust for new cvs layout

---- Files affected:
pld-builder.new/PLD_Builder:
   srpm_builder.py (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.54 pld-builder.new/PLD_Builder/srpm_builder.py:1.55
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.54	Tue Apr  7 16:23:27 2009
+++ pld-builder.new/PLD_Builder/srpm_builder.py	Tue Apr 28 15:10:19 2009
@@ -91,7 +91,7 @@
                     tag_test=""
     else:
                     tag_test=" -Tp %s -tt" % (config.tag_prefixes[0],)
-    cmd = ("cd rpm/SPECS; nice -n %s ./builder %s -bs %s -r %s %s %s %s 2>&1" %
+    cmd = ("cd rpm/packages; nice -n %s ./builder %s -bs %s -r %s %s %s %s 2>&1" %
              (config.nice, builder_opts, b.bconds_string(), b.branch, 
               tag_test, b.kernel_string(), b.spec))
     util.append_to(b.logfile, "request from: %s" % r.requester)
@@ -118,9 +118,10 @@
                         (b.branch, pref, b.spec), logfile = b.logfile)
     if res == 0:
         transfer_file(r, b)
-    chroot.run("cd rpm/SPECS; rpmbuild --nodeps --nobuild " \
+    packagedir = "rpm/packages/%s" % b.spec[:-5]
+    chroot.run("cd %s; rpmbuild --nodeps --nobuild --define '_specdir %s' --define '_sourcedir %s' " \
                          "--clean --rmspec --rmsource %s" % \
-                         b.spec, logfile = b.logfile)
+                         (packagedir, packagedir, b.spec), logfile = b.logfile)
     status.pop()
     return res
 
================================================================

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