Improve RPM packaging