fpm 0.2.16 → 0.2.17
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/fpm/builder.rb +5 -1
- data/lib/fpm/target/deb.rb +4 -2
- metadata +3 -3
data/lib/fpm/builder.rb
CHANGED
@@ -61,7 +61,11 @@ class FPM::Builder
|
|
61
61
|
# Assemble the package
|
62
62
|
def assemble!
|
63
63
|
version_a = [ @source[:version], @package.iteration ].compact
|
64
|
-
|
64
|
+
if @package.epoch
|
65
|
+
output.gsub!(/VERSION/, "#{@package.epoch}:" + version_a.join('-'))
|
66
|
+
else
|
67
|
+
output.gsub!(/VERSION/, version_a.join('-'))
|
68
|
+
end
|
65
69
|
output.gsub!(/ARCH/, @package.architecture)
|
66
70
|
|
67
71
|
File.delete(output) if File.exists?(output) && !File.directory?(output)
|
data/lib/fpm/target/deb.rb
CHANGED
@@ -29,10 +29,12 @@ class FPM::Target::Deb < FPM::Package
|
|
29
29
|
end # def build
|
30
30
|
|
31
31
|
def default_output
|
32
|
+
v = version
|
33
|
+
v = "#{epoch}:#{v}" if epoch
|
32
34
|
if iteration
|
33
|
-
"#{name}_#{
|
35
|
+
"#{name}_#{v}-#{iteration}_#{architecture}.#{type}"
|
34
36
|
else
|
35
|
-
"#{name}_#{
|
37
|
+
"#{name}_#{v}_#{architecture}.#{type}"
|
36
38
|
end
|
37
39
|
end # def default_output
|
38
40
|
end # class FPM::Deb
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fpm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 53
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 2
|
9
|
-
-
|
10
|
-
version: 0.2.
|
9
|
+
- 17
|
10
|
+
version: 0.2.17
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Jordan Sissel
|