various updates to build for osg rpm