Update to latest version

[rpm] Follow upstream changes to paths
[upstream] Update to latest version