Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

- fix up rpm relocatability support

  • Loading branch information...
commit 8db881006af9ce32e5a331a64dd3e0668ec5b75c 1 parent 08caf38
@jordansissel authored
Showing with 5 additions and 2 deletions.
  1. +2 −0  CHANGELIST
  2. +2 −1  lib/fpm/package/rpm.rb
  3. +1 −1  templates/rpm.erb
View
2  CHANGELIST
@@ -5,6 +5,8 @@
cleanup (#228, patch by sbuss)
- rpm: 'vendor' in rpm spec is now omitted if empty or nil. This fixes a bug
where rpmbuild fails due to empty 'Vendor' tag if you convert rpm to rpm.
+ - rpm: relocatable rpms now supported when you specify a '--prefix' flag to fpm.
+ Example: fpm -s dir -t rpm --prefix /usr/local -n example /etc/motd
0.4.10 (May 25, 2012)
- Fix python package support for python3 (#212, patch by Slezhuk Evgeniy)
View
3  lib/fpm/package/rpm.rb
@@ -209,7 +209,8 @@ def prefix
end # def prefix
def build_sub_dir
- return File.join("BUILD", prefix)
+ return "BUILD"
+ #return File.join("BUILD", prefix)
end # def prefix
View
2  templates/rpm.erb
@@ -117,11 +117,11 @@ fi
# Replace * with [*] to make rpm not use globs
files.collect { |f| "/#{f}" } \
.reject { |f| config_files.include?(f) } \
- .collect { |f| File.join(prefix, f) } \
.collect { |f| f[/\s/] and "\"#{f}\"" or f } \
.collect { |f| f.gsub("[", "[\\[]") } \
.collect { |f| f.gsub("*", "[*]") } \
.join("\n")
+ #.collect { |f| File.join(prefix, f) } \
%>
%changelog
Please sign in to comment.
Something went wrong with that request. Please try again.