Merge remote-tracking branch 'PLD/master' into git

Conflicts:
    PLD_Builder/srpm_builder.py

diff --cc PLD_Builder/request_handler.py
Simple merge

diff --cc PLD_Builder/srpm_builder.py
index e1dc09be8c538f05d19d6e296264e54b16a73750,16c23d0fba6b7517925b6b93db8377d049b61445..05208586ec6c56a7df86123e4c8bf8cada31a367
--- 1/PLD_Builder/srpm_builder.py
--- 2/PLD_Builder/srpm_builder.py
+++ b/PLD_Builder/srpm_builder.py
@@@ -124,12 -130,15 +130,14 @@@ def build_srpm(r, b)
                          (b.branch, pref, b.spec), logfile = b.logfile)
      if res == 0:
          transfer_file(r, b)
-     packagedir = "rpm/packages/%s" % b.spec[:-5]
+ 
      packagename = b.spec[:-5]
 -    chroot.run("rpmbuild --nodeps --nobuild --define '_topdir %%(echo $HOME/rpm)' --define '_specdir %%{_topdir}/packages/%%{name}' --define '_sourcedir %%{_specdir}' " \
 -            "--clean --rmspec --rmsource %s/%s" % \
 -            (packagedir, b.spec), logfile = b.logfile)
+     packagedir = "rpm/packages/%s" % packagename
 +    chroot.run("rpm/packages/builder -m %s" % \
 +            (b.spec,), logfile = b.logfile)
      chroot.run("rm -rf %s" % packagedir, logfile = b.logfile)
      status.pop()
+ 
      if res:
          res = "FAIL"
      return res

diff --cc client/make-request.sh
index 92ffa81383d7a73003744370364d97a01bc89806,13518be72f59efed127efe3831948deaa746bd85..b79854b2a9215db2ee6d8856f795996e7b85121e
mode 100755,100644..100755
--- 1/client/make-request.sh
--- 2/client/make-request.sh
+++ b/client/make-request.sh

diff --cc client/smtpwrapper.py
index b4c77c70fe10abc43454e86b9c2af8b30cac7f3f,ad4ff7b212959fd5baa9a76d12e90a1766db3b45..ad4ff7b212959fd5baa9a76d12e90a1766db3b45
mode 100755,100644..100755
--- 1/client/smtpwrapper.py
--- 2/client/smtpwrapper.py
+++ b/client/smtpwrapper.py