RPM specfile and fixes to restore utility