Revert "Added -1 suffix to generated rpm"

This reverts commit 331c1a9004429add91d7187b162f0920990bcd18.