change %define to %global

move all variables to top

clean spaces and header order
Merge pull request #1339 from tdawson/tdawson/cleanup-spec-headers

Merged by openshift-bot