Re-enabled Rivet2 and fixed its spec file.