Updating script and spec file to enable 2.1 RPMS

Updating to enable easy RPMS for 2.1