[pmount/f17] (4 commits) ...Fix spec conflicts.

[Richard Shaw]

Summary of changes:

  6e9a15f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  fe49681... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  42a5c1a... Fix cflags to meet packaging guidelines for packages that c (*)
  11e014e... Fix spec conflicts. (*)

(*) This commit already existed in another branch; no separate mail sent