Merge pull request #315 from mashion/target-os-fix

Respect rpmbuild's argument ordering for #309

lib/fpm/package/rpm.rb

@@ -197,17 +197,19 @@ def output(output_path)
     output_check(output_path)
     raise FileAlreadyExists.new(output_path) if File.exists?(output_path)
     %w(BUILD RPMS SRPMS SOURCES SPECS).each { |d| FileUtils.mkdir_p(build_path(d)) }
-    args = ["rpmbuild", "-bb",
+    args = ["rpmbuild", "-bb"]
+
+    # issue #309
+    rpm_target = "#{architecture}-unknown-#{attributes[:rpm_os]}"
+    args += ["--target", rpm_target]
+
+    args += [
       "--define", "buildroot #{build_path}/BUILD",
       "--define", "_topdir #{build_path}",
       "--define", "_sourcedir #{build_path}",
       "--define", "_rpmdir #{build_path}/RPMS",
     ]
 
-    # issue #309
-    rpm_target = "#{architecture}-unknown-#{attributes[:rpm_os]}"
-    args += ["--target", rpm_target]
-
     args += ["--sign"] if attributes[:rpm_sign?]
 
     (attributes[:rpm_rpmbuild_define] or []).each do |define|