spec: Finally commit os2-rpm-macros removal (after rename to os2-rpm).
Svn is really annoying sometimes with its artificial conflicts that break valid commits.