Build updates for Fedora 21.

This adds fc21 and removes fc19 from the 2.6 build. There are also two small
specfile fixes.
What motivated this change?