Re-enabled Rivet2 and fixed its spec file.
Merge pull request #450 from degano/rivet2_enablefixed

Re-enabled Rivet2 and fixed its spec file.