fpm 0.4.4 → 0.4.5

data/CHANGELIST

@@ -1,3 +1,9 @@
+0.4.5 (April 3, 2012)
+  - Fix gem->rpm conversion where the '~>' rubygem version operator (#193,
+    patch by antoncohen)
+  - Escape filenames RPM install process (permits files with spaces, dollar signs, etc) 
+    (#196, reported by pspiertz)
+
 0.4.4 (March 30, 2012)
   - Fix a bug in gem bin_dir handling (Calen Pennington)
   - The --config-files flag should work again (Brian Akins)

data/lib/fpm/package/rpm.rb

@@ -91,7 +91,7 @@ class FPM::Package::RPM < FPM::Package
         name, op, version = dep.split(/\s+/)
         if op == "~>"
           # ~> x.y means: > x.y and < (x+1).0
-          fixed_deps << "#{name} > #{version}"
+          fixed_deps << "#{name} >= #{version}"
           fixed_deps << "#{name} < #{version.to_i + 1}.0.0"
         else
           fixed_deps << dep

data/templates/rpm.erb

@@ -60,15 +60,15 @@ Obsoletes: <%= repl %>
 
 %install
 <% files.each do |path| -%>
-<%   source = File.join(staging_path, path) -%>
+<%   source = Shellwords.shellescape(File.join(staging_path, path)) -%>
 <%   # Copy to the build_path/BUILD/ to make rpmbuild happy -%>
-<%   target = File.join(build_path, "BUILD", path) -%>
+<%   target = Shellwords.shellescape(File.join(build_path, "BUILD", path)) -%>
 <%   dir = File.dirname(target) %>
-mkdir -p "<%= dir %>"
-if [ -f "<%= source %>" ] || [ -h "<%= source %>" ] ; then
-  cp -d "<%= source %>" "<%= target %>"
-elif [ -d "<%= source %>" ] ; then
-  mkdir "<%= target %>"
+mkdir -p <%= dir %>
+if [ -f <%= source %> ] || [ -h <%= source %> ] ; then
+  cp -d <%= source %> <%= target %>
+elif [ -d <%= source %> ] ; then
+  mkdir <%= target %>
 fi
 <% end %>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json