Update RPM packaging

Change the rev name so that we can specify our version cleanly.  Copy the jmx collectors, but disabled, and also copy the jmx collector jar.