[oe-commits] Bian Naimeng : package_rpm.bbclass: remove xx.spec before doing rpmbuild xx .src.rpm

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 760af902a98b350a2f1f3203fa0096965924a83d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=760af902a98b350a2f1f3203fa0096965924a83d

Author: Bian Naimeng <biannm at cn.fujitsu.com>
Date:   Tue Jul  9 08:27:43 2013 +0000

package_rpm.bbclass: remove xx.spec before doing rpmbuild xx.src.rpm

If the spec file already exist, and has not been stored into pseudo's files.db,
it maybe cause rpmbuild src.rpm fail, so remove it before doing rpmbuild src.rpm.

Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>

---

 meta/classes/package_rpm.bbclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index fa928ce..1537079 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -1079,8 +1079,13 @@ python do_package_rpm () {
         return
 
     # Construct the spec file...
+    # If the spec file already exist, and has not been stored into 
+    # pseudo's files.db, it maybe cause rpmbuild src.rpm fail,
+    # so remove it before doing rpmbuild src.rpm.
     srcname    = strip_multilib(d.getVar('PN', True), d)
     outspecfile = workdir + "/" + srcname + ".spec"
+    if os.path.isfile(outspecfile):
+        os.remove(outspecfile)
     d.setVar('OUTSPECFILE', outspecfile)
     bb.build.exec_func('write_specfile', d)