Re-enabled Rivet2 and fixed its spec file.

Used the fix proposed by @davidlt in #444 and re-enabled the build of rivet2.