Merge pull request #328 from euanh/rpmlint

Rpmlint fixes
Merge pull request #329 from euanh/rpmlint

Rpmlint fixes