911166 - Use pulp_version macro for consistency and conditional requires on both version and release for pre-release packages only.
Merge branch 'pulp-2.1' into jortel-911166

Conflicts:
	platform/pulp.spec
Merge pull request #371 from pulp/jortel-911166

911166 - Use pulp_version macro for consistency and conditional requires...