fpm 1.3.0 → 1.3.2

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.
Files changed (8) hide show
  1. checksums.yaml +7 -7
  2. data/CHANGELIST +9 -1
  3. data/lib/fpm/package/deb.rb +15 -2
  4. data/lib/fpm/package/python.rb +1 -1
  5. data/lib/fpm/package/rpm.rb +1 -1
  6. data/lib/fpm/version.rb +1 -1
  7. data/templates/deb/changelog.erb +1 -1
  8. metadata +178 -130
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 94e2acc2a51dca9658374538128343b060301a57
4
- data.tar.gz: ae3771e347496bd609cfa118c602d59a9277daf5
5
- SHA512:
6
- metadata.gz: 21ce60f7679ae634fdf4a55214b93476bc0d14d41fe1806b4f25133dfa6b4035dc4acf1d4c9d3eaa420a3960a2daedf11e6dd16499dcd04be09d13718432d4ef
7
- data.tar.gz: dab536c4438a4db9f1920a8be8903b62060ac0b7a9c1b075eeedda225364bb79ea7f55d942163167262995b0d749c9f8859caf8997656fe6378046d761894535
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 3a77a3aacf9169d0736145ed029fd2ab6680aedb
4
+ data.tar.gz: d1aa6823e333933f41f7e8acb26bcdac30882931
5
+ SHA512:
6
+ metadata.gz: 52bc56b7772cd9503da659c7c9eab7f3a52ed2f5e9288cb91699cbb5fb9ee27bcfcfd12c1602f600f707aac032624354a227bf2fcc987ef575fa68672b8d3d72
7
+ data.tar.gz: 7e7119f5906c4cc6cfa849ca0b4abd00a21c8dcdeac1cec6f1dbf58cc01fdc577f7fd7f6144dc88747048c3d5d1c5916c471930dbc2acad8e80675f3741a3acd
data/CHANGELIST CHANGED
@@ -1,4 +1,12 @@
1
- 1.3.0 (????)
1
+ 1.3.2 (November 4, 2014)
2
+ - deb: conversion from another deb will automatically use any changelog found in
3
+ the source deb (Jordan Sissel)
4
+
5
+ 1.3.1 (November 4, 2014)
6
+ - deb: fix md5sums generation such that `dpkg -V` now works (#799, Matteo Panella)
7
+ - rpm: Use maximum compression when choosing xz (#797, Ashish Kulkarni)
8
+
9
+ 1.3.0 (October 25, 2014)
2
10
  - Fixed a bunch of Ruby 1.8.7-related bugs. (Jordan Sissel)
3
11
  - cpan: Fix bug in author handling (#744, Leon Weidauer)
4
12
  - cpan: Better removal of perllocal.pod (#763, #443, #510, Mathias Lafeldt)
data/lib/fpm/package/deb.rb CHANGED
@@ -451,7 +451,20 @@ class FPM::Package::Deb < FPM::Package
451
451
  self.provides = self.provides.collect do |provides|
452
452
  fix_provides(provides)
453
453
  end.flatten
454
-
454
+
455
+ if origin == FPM::Package::Deb
456
+ changelog_path = staging_path("usr/share/doc/#{name}/changelog.Debian.gz")
457
+ if File.exists?(changelog_path)
458
+ logger.debug("Found a deb changelog file, using it.", :path => changelog_path)
459
+ attributes[:deb_changelog] = build_path("deb_changelog")
460
+ File.open(attributes[:deb_changelog], "w") do |deb_changelog|
461
+ Zlib::GzipReader.open(changelog_path) do |gz|
462
+ IO::copy_stream(gz, deb_changelog)
463
+ end
464
+ end
465
+ File.unlink(changelog_path)
466
+ end
467
+ end
455
468
  end # def converted_from
456
469
 
457
470
  def debianize_op(op)
@@ -718,7 +731,7 @@ class FPM::Package::Deb < FPM::Package
718
731
  if not md5_sums.empty?
719
732
  File.open(control_path("md5sums"), "w") do |out|
720
733
  md5_sums.each do |path, md5|
721
- out.puts "#{md5} #{path}"
734
+ out.puts "#{md5} #{path}"
722
735
  end
723
736
  end
724
737
  File.chmod(0644, control_path("md5sums"))
data/lib/fpm/package/python.rb CHANGED
@@ -52,7 +52,7 @@ class FPM::Package::Python < FPM::Package
52
52
  "should be installed to."
53
53
  option "--install-lib", "LIB_PATH", "The path to where python libs " \
54
54
  "should be installed to (default depends on your python installation). " \
55
- "Want to what your target platform is using? Run this: " \
55
+ "Want to find out what your target platform is using? Run this: " \
56
56
  "python -c 'from distutils.sysconfig import get_python_lib; " \
57
57
  "print get_python_lib()'"
58
58
  option "--install-data", "DATA_PATH", "The path to where data should be " \
data/lib/fpm/package/rpm.rb CHANGED
@@ -24,7 +24,7 @@ class FPM::Package::RPM < FPM::Package
24
24
 
25
25
  COMPRESSION_MAP = {
26
26
  "none" => "w0.gzdio",
27
- "xz" => "w2.xzdio",
27
+ "xz" => "w9.xzdio",
28
28
  "gzip" => "w9.gzdio",
29
29
  "bzip2" => "w9.bzdio"
30
30
  } unless defined?(COMPRESSION_MAP)
data/lib/fpm/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FPM
2
- VERSION = "1.3.0"
2
+ VERSION = "1.3.2"
3
3
  end
data/templates/deb/changelog.erb CHANGED
@@ -2,4 +2,4 @@
2
2
 
3
3
  * Package created with FPM.
4
4
 
5
- -- <%= maintainer %>[two spaces] <%= Time.now.strftime("%a, %d %b %Y %T %z") %>
5
+ -- <%= maintainer %> <%= Time.now.strftime("%a, %d %b %Y %T %z") %>
metadata CHANGED
@@ -1,198 +1,246 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: fpm
3
- version: !ruby/object:Gem::Version
4
- version: 1.3.0
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.3.2
5
5
  platform: ruby
6
- authors:
6
+ authors:
7
7
  - Jordan Sissel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
-
12
- date: 2014-10-25 00:00:00 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
11
+ date: 2014-11-05 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
15
14
  name: json
16
- prerelease: false
17
- requirement: &id001 !ruby/object:Gem::Requirement
18
- requirements:
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
19
17
  - - ">="
20
- - !ruby/object:Gem::Version
18
+ - !ruby/object:Gem::Version
21
19
  version: 1.7.7
22
20
  type: :runtime
23
- version_requirements: *id001
24
- - !ruby/object:Gem::Dependency
25
- name: cabin
26
21
  prerelease: false
27
- requirement: &id002 !ruby/object:Gem::Requirement
28
- requirements:
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
29
24
  - - ">="
30
- - !ruby/object:Gem::Version
25
+ - !ruby/object:Gem::Version
26
+ version: 1.7.7
27
+ - !ruby/object:Gem::Dependency
28
+ name: cabin
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ">="
32
+ - !ruby/object:Gem::Version
31
33
  version: 0.6.0
32
34
  type: :runtime
33
- version_requirements: *id002
34
- - !ruby/object:Gem::Dependency
35
- name: backports
36
35
  prerelease: false
37
- requirement: &id003 !ruby/object:Gem::Requirement
38
- requirements:
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
39
38
  - - ">="
40
- - !ruby/object:Gem::Version
39
+ - !ruby/object:Gem::Version
40
+ version: 0.6.0
41
+ - !ruby/object:Gem::Dependency
42
+ name: backports
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ">="
46
+ - !ruby/object:Gem::Version
41
47
  version: 2.6.2
42
48
  type: :runtime
43
- version_requirements: *id003
44
- - !ruby/object:Gem::Dependency
45
- name: arr-pm
46
49
  prerelease: false
47
- requirement: &id004 !ruby/object:Gem::Requirement
48
- requirements:
49
- - - ~>
50
- - !ruby/object:Gem::Version
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ">="
53
+ - !ruby/object:Gem::Version
54
+ version: 2.6.2
55
+ - !ruby/object:Gem::Dependency
56
+ name: arr-pm
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
51
61
  version: 0.0.9
52
62
  type: :runtime
53
- version_requirements: *id004
54
- - !ruby/object:Gem::Dependency
55
- name: clamp
56
63
  prerelease: false
57
- requirement: &id005 !ruby/object:Gem::Requirement
58
- requirements:
59
- - - ~>
60
- - !ruby/object:Gem::Version
61
- version: "0.6"
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
68
+ version: 0.0.9
69
+ - !ruby/object:Gem::Dependency
70
+ name: clamp
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: '0.6'
62
76
  type: :runtime
63
- version_requirements: *id005
64
- - !ruby/object:Gem::Dependency
65
- name: childprocess
66
77
  prerelease: false
67
- requirement: &id006 !ruby/object:Gem::Requirement
68
- requirements:
69
- - &id007
70
- - ">="
71
- - !ruby/object:Gem::Version
72
- version: "0"
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: '0.6'
83
+ - !ruby/object:Gem::Dependency
84
+ name: childprocess
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - ">="
88
+ - !ruby/object:Gem::Version
89
+ version: '0'
73
90
  type: :runtime
74
- version_requirements: *id006
75
- - !ruby/object:Gem::Dependency
76
- name: ffi
77
91
  prerelease: false
78
- requirement: &id008 !ruby/object:Gem::Requirement
79
- requirements:
80
- - *id007
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ">="
95
+ - !ruby/object:Gem::Version
96
+ version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: ffi
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - ">="
102
+ - !ruby/object:Gem::Version
103
+ version: '0'
81
104
  type: :runtime
82
- version_requirements: *id008
83
- - !ruby/object:Gem::Dependency
84
- name: rspec
85
105
  prerelease: false
86
- requirement: &id009 !ruby/object:Gem::Requirement
87
- requirements:
88
- - - ~>
89
- - !ruby/object:Gem::Version
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ">="
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
111
+ - !ruby/object:Gem::Dependency
112
+ name: rspec
113
+ requirement: !ruby/object:Gem::Requirement
114
+ requirements:
115
+ - - "~>"
116
+ - !ruby/object:Gem::Version
90
117
  version: 3.0.0
91
118
  type: :development
92
- version_requirements: *id009
93
- - !ruby/object:Gem::Dependency
94
- name: insist
95
119
  prerelease: false
96
- requirement: &id010 !ruby/object:Gem::Requirement
97
- requirements:
98
- - - ~>
99
- - !ruby/object:Gem::Version
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - "~>"
123
+ - !ruby/object:Gem::Version
124
+ version: 3.0.0
125
+ - !ruby/object:Gem::Dependency
126
+ name: insist
127
+ requirement: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - "~>"
130
+ - !ruby/object:Gem::Version
100
131
  version: 0.0.5
101
132
  type: :development
102
- version_requirements: *id010
103
- - !ruby/object:Gem::Dependency
104
- name: pry
105
133
  prerelease: false
106
- requirement: &id011 !ruby/object:Gem::Requirement
107
- requirements:
108
- - *id007
134
+ version_requirements: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - "~>"
137
+ - !ruby/object:Gem::Version
138
+ version: 0.0.5
139
+ - !ruby/object:Gem::Dependency
140
+ name: pry
141
+ requirement: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - ">="
144
+ - !ruby/object:Gem::Version
145
+ version: '0'
109
146
  type: :development
110
- version_requirements: *id011
111
- - !ruby/object:Gem::Dependency
112
- name: stud
113
147
  prerelease: false
114
- requirement: &id012 !ruby/object:Gem::Requirement
115
- requirements:
116
- - *id007
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - ">="
151
+ - !ruby/object:Gem::Version
152
+ version: '0'
153
+ - !ruby/object:Gem::Dependency
154
+ name: stud
155
+ requirement: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - ">="
158
+ - !ruby/object:Gem::Version
159
+ version: '0'
117
160
  type: :development
118
- version_requirements: *id012
119
- description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs, solaris packages and more. Win at package management without wasting pointless hours debugging bad rpm specs!
161
+ prerelease: false
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - ">="
165
+ - !ruby/object:Gem::Version
166
+ version: '0'
167
+ description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
168
+ solaris packages and more. Win at package management without wasting pointless hours
169
+ debugging bad rpm specs!
120
170
  email: jls@semicomplete.com
121
- executables:
171
+ executables:
122
172
  - fpm
123
173
  extensions: []
124
-
125
174
  extra_rdoc_files: []
126
-
127
- files:
175
+ files:
176
+ - CHANGELIST
177
+ - CONTRIBUTORS
178
+ - LICENSE
179
+ - bin/fpm
128
180
  - lib/fpm.rb
129
- - lib/fpm/version.rb
130
181
  - lib/fpm/command.rb
131
- - lib/fpm/package/pkgin.rb
132
- - lib/fpm/package/zip.rb
182
+ - lib/fpm/errors.rb
183
+ - lib/fpm/namespace.rb
184
+ - lib/fpm/package.rb
185
+ - lib/fpm/package/cpan.rb
186
+ - lib/fpm/package/deb.rb
133
187
  - lib/fpm/package/dir.rb
188
+ - lib/fpm/package/empty.rb
189
+ - lib/fpm/package/gem.rb
134
190
  - lib/fpm/package/npm.rb
135
- - lib/fpm/package/sh.rb
136
- - lib/fpm/package/cpan.rb
137
- - lib/fpm/package/rpm.rb
191
+ - lib/fpm/package/osxpkg.rb
138
192
  - lib/fpm/package/pear.rb
139
- - lib/fpm/package/pyfpm/get_metadata.pyc
193
+ - lib/fpm/package/pkgin.rb
194
+ - lib/fpm/package/puppet.rb
140
195
  - lib/fpm/package/pyfpm/__init__.py
141
- - lib/fpm/package/pyfpm/get_metadata.py
142
196
  - lib/fpm/package/pyfpm/__init__.pyc
143
- - lib/fpm/package/gem.rb
144
- - lib/fpm/package/deb.rb
145
- - lib/fpm/package/osxpkg.rb
197
+ - lib/fpm/package/pyfpm/get_metadata.py
198
+ - lib/fpm/package/pyfpm/get_metadata.pyc
199
+ - lib/fpm/package/python.rb
200
+ - lib/fpm/package/rpm.rb
201
+ - lib/fpm/package/sh.rb
146
202
  - lib/fpm/package/solaris.rb
147
203
  - lib/fpm/package/tar.rb
148
- - lib/fpm/package/puppet.rb
149
- - lib/fpm/package/empty.rb
150
- - lib/fpm/package/python.rb
204
+ - lib/fpm/package/zip.rb
151
205
  - lib/fpm/util.rb
152
- - lib/fpm/errors.rb
153
- - lib/fpm/namespace.rb
154
- - lib/fpm/package.rb
155
- - bin/fpm
156
- - templates/rpm/filesystem_list
157
- - templates/sh.erb
158
- - templates/puppet/package/remove.pp.erb
159
- - templates/puppet/package.pp.erb
160
- - templates/osxpkg.erb
161
- - templates/rpm.erb
162
- - templates/solaris.erb
206
+ - lib/fpm/version.rb
207
+ - templates/deb.erb
163
208
  - templates/deb/changelog.erb
209
+ - templates/deb/ldconfig.sh.erb
210
+ - templates/deb/postinst_upgrade.sh.erb
164
211
  - templates/deb/postrm_upgrade.sh.erb
165
212
  - templates/deb/preinst_upgrade.sh.erb
166
213
  - templates/deb/prerm_upgrade.sh.erb
167
- - templates/deb/ldconfig.sh.erb
168
- - templates/deb/postinst_upgrade.sh.erb
169
- - templates/deb.erb
170
- - LICENSE
171
- - CONTRIBUTORS
172
- - CHANGELIST
214
+ - templates/osxpkg.erb
215
+ - templates/puppet/package.pp.erb
216
+ - templates/puppet/package/remove.pp.erb
217
+ - templates/rpm.erb
218
+ - templates/rpm/filesystem_list
219
+ - templates/sh.erb
220
+ - templates/solaris.erb
173
221
  homepage: https://github.com/jordansissel/fpm
174
- licenses:
222
+ licenses:
175
223
  - MIT-like
176
224
  metadata: {}
177
-
178
225
  post_install_message:
179
226
  rdoc_options: []
180
-
181
- require_paths:
227
+ require_paths:
182
228
  - lib
183
229
  - lib
184
- required_ruby_version: !ruby/object:Gem::Requirement
185
- requirements:
186
- - *id007
187
- required_rubygems_version: !ruby/object:Gem::Requirement
188
- requirements:
189
- - *id007
230
+ required_ruby_version: !ruby/object:Gem::Requirement
231
+ requirements:
232
+ - - ">="
233
+ - !ruby/object:Gem::Version
234
+ version: '0'
235
+ required_rubygems_version: !ruby/object:Gem::Requirement
236
+ requirements:
237
+ - - ">="
238
+ - !ruby/object:Gem::Version
239
+ version: '0'
190
240
  requirements: []
191
-
192
241
  rubyforge_project:
193
- rubygems_version: 2.0.14
242
+ rubygems_version: 2.2.2
194
243
  signing_key:
195
244
  specification_version: 4
196
245
  summary: fpm - package building and mangling
197
246
  test_files: []
198
-