fpm 0.4.4 → 0.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELIST +6 -0
- data/lib/fpm/package/rpm.rb +1 -1
- data/templates/rpm.erb +7 -7
- metadata +2 -2
data/CHANGELIST
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
0.4.5 (April 3, 2012)
|
|
2
|
+
- Fix gem->rpm conversion where the '~>' rubygem version operator (#193,
|
|
3
|
+
patch by antoncohen)
|
|
4
|
+
- Escape filenames RPM install process (permits files with spaces, dollar signs, etc)
|
|
5
|
+
(#196, reported by pspiertz)
|
|
6
|
+
|
|
1
7
|
0.4.4 (March 30, 2012)
|
|
2
8
|
- Fix a bug in gem bin_dir handling (Calen Pennington)
|
|
3
9
|
- The --config-files flag should work again (Brian Akins)
|
data/lib/fpm/package/rpm.rb
CHANGED
|
@@ -91,7 +91,7 @@ class FPM::Package::RPM < FPM::Package
|
|
|
91
91
|
name, op, version = dep.split(/\s+/)
|
|
92
92
|
if op == "~>"
|
|
93
93
|
# ~> x.y means: > x.y and < (x+1).0
|
|
94
|
-
fixed_deps << "#{name}
|
|
94
|
+
fixed_deps << "#{name} >= #{version}"
|
|
95
95
|
fixed_deps << "#{name} < #{version.to_i + 1}.0.0"
|
|
96
96
|
else
|
|
97
97
|
fixed_deps << dep
|
data/templates/rpm.erb
CHANGED
|
@@ -60,15 +60,15 @@ Obsoletes: <%= repl %>
|
|
|
60
60
|
|
|
61
61
|
%install
|
|
62
62
|
<% files.each do |path| -%>
|
|
63
|
-
<% source = File.join(staging_path, path) -%>
|
|
63
|
+
<% source = Shellwords.shellescape(File.join(staging_path, path)) -%>
|
|
64
64
|
<% # Copy to the build_path/BUILD/ to make rpmbuild happy -%>
|
|
65
|
-
<% target = File.join(build_path, "BUILD", path) -%>
|
|
65
|
+
<% target = Shellwords.shellescape(File.join(build_path, "BUILD", path)) -%>
|
|
66
66
|
<% dir = File.dirname(target) %>
|
|
67
|
-
mkdir -p
|
|
68
|
-
if [ -f
|
|
69
|
-
cp -d
|
|
70
|
-
elif [ -d
|
|
71
|
-
mkdir
|
|
67
|
+
mkdir -p <%= dir %>
|
|
68
|
+
if [ -f <%= source %> ] || [ -h <%= source %> ] ; then
|
|
69
|
+
cp -d <%= source %> <%= target %>
|
|
70
|
+
elif [ -d <%= source %> ] ; then
|
|
71
|
+
mkdir <%= target %>
|
|
72
72
|
fi
|
|
73
73
|
<% end %>
|
|
74
74
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fpm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.5
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-
|
|
12
|
+
date: 2012-04-04 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: json
|