Merge pull request jordansissel#428 from phrawzty/defattr

add args for controlling rpm %defattr

lib/fpm/package/rpm.rb

@@ -44,6 +44,18 @@ class FPM::Package::RPM < FPM::Package
       value
   end
 
+  option "--defattrfile", "ATTR",
+    "Set the default file mode (%defattr).",
+    :default => '-' do |value|
+      value
+  end
+
+  option "--defattrdir", "ATTR",
+    "Set the default dir mode (%defattr).",
+    :default => '-' do |value|
+      value
+  end
+
   rpmbuild_define = []
   option "--rpmbuild-define", "DEFINITION",
     "Pass a --define argument to rpmbuild." do |define|

templates/rpm.erb

@@ -142,7 +142,7 @@ cp <%= source_safe %> <%= target_safe %>
 <% end -%>
 
 %files
-%defattr(-,<%= attributes[:rpm_user] %>,<%= attributes[:rpm_group] %>,-)
+%defattr(<%= attributes[:rpm_defattrfile] %>,<%= attributes[:rpm_user] %>,<%= attributes[:rpm_group] %>,<%= attributes[:rpm_defattrdir] %>)
 <%# Output config files and then regular files. -%>
 <% config_files.each do |path| -%>
 %config(noreplace) <%= rpm_fix_name(path) %>