Made  improvements for rpmbuild

Change-Id: I1dd7a54f7ade5414ad07cb8e12d0b018ecbc63c2
Merge "Made  improvements for rpmbuild"