Apply fixes for building on Fedora 20 and RHEL7.

A few build macros have shifted, breaking the spec on RHEL7.

Using the supplied patches, I was able to get a working cvmfs RPM for RHEL7 and Fedora 20.