Updating spec file for latest fixes. After basic testing, most things appear to work, but still not perfect.