Work-around for RH Bugzilla 681540 (defattr overrides in-line attr)
Merge branch 'ryanuber-rpm-file-attr-workaround'

closes #1385

By Ryan Uber:
* ryanuber-rpm-file-attr-workaround:
  Work-around for RH Bugzilla 681540 (defattr overrides in-line attr)