fpm 0.4.18 → 0.4.19

data/CHANGELIST

@@ -1,3 +1,6 @@
+0.4.19 (September 26, 2012)
+  - Escape '%' characters in file names (#266, #222. Patch by John Wittkoski)
+
 0.4.18 (September 25, 2012)
   - Fix regression in rpm building where the epoch in was missing in the rpm,
     but prior fpm versions defaulted it to 1. This caused rpms built with newer

data/lib/fpm/package/rpm.rb

@@ -234,5 +234,6 @@ class FPM::Package::RPM < FPM::Package
   end # def digest_algorithm
 
   public(:input, :output, :converted_from, :architecture, :to_s, :iteration,
-         :payload_compression, :digest_algorithm, :prefix, :build_sub_dir)
+         :payload_compression, :digest_algorithm, :prefix, :build_sub_dir,
+         :epoch)
 end # class FPM::Package::RPM

data/templates/rpm.erb

@@ -69,9 +69,9 @@ Obsoletes: <%= repl %>
 
 %install
 <% files.each do |path| -%>
-<%   source = Shellwords.shellescape(File.join(staging_path, path)) -%>
+<%   source = Shellwords.shellescape(File.join(staging_path, path)).gsub("%", "%%") -%>
 <%   # Copy to the build_path/BUILD/ to make rpmbuild happy -%>
-<%   target = Shellwords.shellescape(File.join(build_path, build_sub_dir, path)) -%>
+<%   target = Shellwords.shellescape(File.join(build_path, build_sub_dir, path)).gsub("%", "%%") -%>
 <%   dir = File.dirname(target) %>
 mkdir -p <%= dir %>
 if [ -f <%= source %> ] || [ -h <%= source %> ] ; then
@@ -117,12 +117,14 @@ fi
   # Replace [ with [\[] to make rpm not use globs
   # Replace * with [*] to make rpm not use globs
   # Replace ? with [?] to make rpm not use globs
+  # Replace % with [%] to make rpm not expand macros
   files.collect { |f| "/#{f}" } \
     .reject { |f| config_files.include?(f) } \
     .collect { |f| f[/\s/] and "\"#{f}\"" or f } \
     .collect { |f| f.gsub("[", "[\\[]") } \
     .collect { |f| f.gsub("*", "[*]") } \
     .collect { |f| f.gsub("?", "[?]") } \
+    .collect { |f| f.gsub("%", "[%]") } \
     .join("\n")
     #.collect { |f| File.join(prefix, f) } \
 %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json