Merge "Add affinity to rpm packaging."