fpm 0.4.25 → 0.4.26
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELIST +8 -0
- data/lib/fpm/package/pyfpm/__init__.pyc +0 -0
- data/lib/fpm/package/pyfpm/get_metadata.pyc +0 -0
- data/lib/fpm/package/rpm.rb +12 -4
- data/lib/fpm/version.rb +1 -1
- data/templates/deb.erb +3 -4
- metadata +14 -15
data/CHANGELIST
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
0.4.26 (December 27, 2012)
|
2
|
+
- rpm: add --rpm-sign flag to sign packages using the 'rpmbuild --sign' flag.
|
3
|
+
(#311, Patch by Pranay Kanwar)
|
4
|
+
- rpm: fix flag ordering when calling rpmbuild (#309, #315, patch by Trotter
|
5
|
+
Cashion)
|
6
|
+
- deb: re-enable "Predepends" support (#319, #320, patch by Pranay Kanwar)
|
7
|
+
- rpm: fix default 'rpm os' value (#321, 314, 309)
|
8
|
+
|
1
9
|
0.4.25 (December 7, 2012)
|
2
10
|
- Added --deb-changelog and --rpm-changelog support flags. Both take a path to
|
3
11
|
a changelog file. Both must be valid changelog formats for their respective
|
Binary file
|
Binary file
|
data/lib/fpm/package/rpm.rb
CHANGED
@@ -75,6 +75,8 @@ class FPM::Package::RPM < FPM::Package
|
|
75
75
|
File.read(File.expand_path(file))
|
76
76
|
end
|
77
77
|
|
78
|
+
option "--sign", :flag, "Pass --sign to rpmbuild"
|
79
|
+
|
78
80
|
private
|
79
81
|
|
80
82
|
# Handle any architecture naming conversions.
|
@@ -195,16 +197,22 @@ class FPM::Package::RPM < FPM::Package
|
|
195
197
|
output_check(output_path)
|
196
198
|
raise FileAlreadyExists.new(output_path) if File.exists?(output_path)
|
197
199
|
%w(BUILD RPMS SRPMS SOURCES SPECS).each { |d| FileUtils.mkdir_p(build_path(d)) }
|
198
|
-
args = ["rpmbuild", "-bb"
|
200
|
+
args = ["rpmbuild", "-bb"]
|
201
|
+
|
202
|
+
# issue #309
|
203
|
+
if !attributes[:rpm_os].nil?
|
204
|
+
rpm_target = "#{architecture}-unknown-#{attributes[:rpm_os]}"
|
205
|
+
args += ["--target", rpm_target]
|
206
|
+
end
|
207
|
+
|
208
|
+
args += [
|
199
209
|
"--define", "buildroot #{build_path}/BUILD",
|
200
210
|
"--define", "_topdir #{build_path}",
|
201
211
|
"--define", "_sourcedir #{build_path}",
|
202
212
|
"--define", "_rpmdir #{build_path}/RPMS",
|
203
213
|
]
|
204
214
|
|
205
|
-
|
206
|
-
rpm_target = "#{architecture}-unknown-#{attributes[:rpm_os]}"
|
207
|
-
args += ["--target", rpm_target]
|
215
|
+
args += ["--sign"] if attributes[:rpm_sign?]
|
208
216
|
|
209
217
|
(attributes[:rpm_rpmbuild_define] or []).each do |define|
|
210
218
|
args += ["--define", define]
|
data/lib/fpm/version.rb
CHANGED
data/templates/deb.erb
CHANGED
@@ -11,10 +11,9 @@ Depends: <%= dependencies.collect { |d| fix_dependency(d) }.flatten.join(", ") %
|
|
11
11
|
<% if !conflicts.empty? -%>
|
12
12
|
Conflicts: <%= conflicts.join(", ") %>
|
13
13
|
<% end -%>
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
<%# end -%>
|
14
|
+
<% if attributes[:deb_pre_depends_given?] -%>
|
15
|
+
Pre-Depends: <%= attributes[:deb_pre_depends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
|
16
|
+
<% end -%>
|
18
17
|
<% if !provides.empty? -%>
|
19
18
|
<%# Turn each provides from 'foo = 123' to simply 'foo' because Debian :\ -%>
|
20
19
|
<%# http://www.debian.org/doc/debian-policy/ch-relationships.html -%>
|
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.26
|
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-
|
12
|
+
date: 2012-12-27 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: json
|
@@ -152,29 +152,29 @@ files:
|
|
152
152
|
- lib/fpm/command.rb
|
153
153
|
- lib/fpm/namespace.rb
|
154
154
|
- lib/fpm/package.rb
|
155
|
-
- lib/fpm/errors.rb
|
156
|
-
- lib/fpm/version.rb
|
157
|
-
- lib/fpm/package/gem.rb
|
158
|
-
- lib/fpm/package/dir.rb
|
159
|
-
- lib/fpm/package/pyfpm/__init__.pyc
|
160
155
|
- lib/fpm/package/pyfpm/get_metadata.pyc
|
161
156
|
- lib/fpm/package/pyfpm/get_metadata.py
|
157
|
+
- lib/fpm/package/pyfpm/__init__.pyc
|
162
158
|
- lib/fpm/package/pyfpm/__init__.py
|
163
|
-
- lib/fpm/package/
|
164
|
-
- lib/fpm/package/pear.rb
|
159
|
+
- lib/fpm/package/tar.rb
|
165
160
|
- lib/fpm/package/deb.rb
|
166
|
-
- lib/fpm/package/
|
167
|
-
- lib/fpm/package/rpm.rb
|
161
|
+
- lib/fpm/package/dir.rb
|
168
162
|
- lib/fpm/package/puppet.rb
|
169
|
-
- lib/fpm/package/
|
163
|
+
- lib/fpm/package/gem.rb
|
164
|
+
- lib/fpm/package/python.rb
|
170
165
|
- lib/fpm/package/solaris.rb
|
166
|
+
- lib/fpm/package/rpm.rb
|
167
|
+
- lib/fpm/package/npm.rb
|
168
|
+
- lib/fpm/package/pear.rb
|
169
|
+
- lib/fpm/version.rb
|
170
|
+
- lib/fpm/errors.rb
|
171
171
|
- lib/fpm/util.rb
|
172
172
|
- lib/fpm.rb
|
173
173
|
- bin/fpm-npm
|
174
174
|
- bin/fpm
|
175
|
-
- templates/deb.erb
|
176
|
-
- templates/rpm.erb
|
177
175
|
- templates/solaris.erb
|
176
|
+
- templates/rpm.erb
|
177
|
+
- templates/deb.erb
|
178
178
|
- templates/puppet/package/remove.pp.erb
|
179
179
|
- templates/puppet/package.pp.erb
|
180
180
|
- LICENSE
|
@@ -206,4 +206,3 @@ signing_key:
|
|
206
206
|
specification_version: 3
|
207
207
|
summary: fpm - package building and mangling
|
208
208
|
test_files: []
|
209
|
-
has_rdoc:
|