fpm 0.4.13 → 0.4.14

data/CHANGELIST

@@ -1,3 +1,6 @@
+0.4.14 (August 24, 2012)
+  - rpm: Replace newlines with space in any license setting. (#252)
+
 0.4.13 (August 14, 2012)
   - Make --exclude accept path prefixes as well. If you have a files in
     'usr/share/man' in your package, you can now exclude all of a subdir

data/lib/fpm/command.rb

@@ -61,24 +61,29 @@ class FPM::Command < Clamp::Command
     @dependencies << val
   end # -d / --depends
   option "--provides", "PROVIDES",
-    "What this package provides (usually a name)" do |val|
+    "What this package provides (usually a name). This flag can be "\
+    "specified multiple times." do |val|
     @provides ||= []
     @provides << val
   end # --provides
   option "--conflicts", "CONFLICTS",
-    "Other packages/versions this package conflicts with" do |val|
+    "Other packages/versions this package conflicts with. This flag can " \
+    "specified multiple times." do |val|
     @conflicts ||= []
     @conflicts << val
   end # --conflicts
   option "--replaces", "REPLACES",
-    "Other packages/versions this package replaces" do |val|
+    "Other packages/versions this package replaces. This flag can be "\
+    "specified multiple times." do |val|
     @replaces ||= []
     @replaces << val
   end # --replaces
   option "--config-files", "CONFIG_FILES",
     "Mark a file in the package as being a config file. This uses 'conffiles'" \
     " in debs and %config in rpm. You can specify a directory to have it " \
-    "scanned marking all files found as config files" do |val|
+    "scanned marking all files found as config files. If you have multiple " \
+    "files to mark as configuration files, specify this flag multiple times." \
+    do |val|
     @config_files ||= []
     @config_files << val
   end # --config-files

data/templates/rpm.erb

@@ -32,7 +32,11 @@ Prefix: <%= prefix %>
 <% end -%>
 
 Group: <%= category %>
-License: <%= license %>
+<%# Sometimes the 'license' field has multiple lines... Hack around it. 
+  # While technically yes this means we are 'modifying' the license,
+  # since the job of FPM is to get shit done and that this is  only
+  # modifying whitespace, it should be reasonably OK. -%>
+License: <%= license.gsub("\n", " ") %>
 <% if !vendor.nil? and !vendor.empty? -%>
 Vendor: <%= vendor %>
 <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -150,32 +150,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/fpm/errors.rb
-- lib/fpm/util.rb
-- lib/fpm/command.rb
-- lib/fpm/package/pyfpm/get_metadata.py
-- lib/fpm/package/pyfpm/__init__.pyc
-- lib/fpm/package/pyfpm/get_metadata.pyc
-- lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/python.rb
-- lib/fpm/package/rpm.rb
 - lib/fpm/package/npm.rb
-- lib/fpm/package/deb.rb
+- lib/fpm/package/python.rb
+- lib/fpm/package/solaris.rb
+- lib/fpm/package/dir.rb
 - lib/fpm/package/gem.rb
-- lib/fpm/package/tar.rb
 - lib/fpm/package/pear.rb
-- lib/fpm/package/dir.rb
 - lib/fpm/package/puppet.rb
-- lib/fpm/package/solaris.rb
+- lib/fpm/package/pyfpm/__init__.py
+- lib/fpm/package/pyfpm/__init__.pyc
+- lib/fpm/package/pyfpm/get_metadata.pyc
+- lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/tar.rb
+- lib/fpm/package/deb.rb
+- lib/fpm/package/rpm.rb
+- lib/fpm/util.rb
 - lib/fpm/package.rb
 - lib/fpm/namespace.rb
+- lib/fpm/command.rb
 - lib/fpm.rb
-- bin/fpm-npm
 - bin/fpm
-- templates/puppet/package/remove.pp.erb
-- templates/puppet/package.pp.erb
+- bin/fpm-npm
 - templates/deb.erb
-- templates/solaris.erb
 - templates/rpm.erb
+- templates/solaris.erb
+- templates/puppet/package/remove.pp.erb
+- templates/puppet/package.pp.erb
 - LICENSE
 - CONTRIBUTORS
 - CHANGELIST
@@ -205,4 +205,3 @@ signing_key:
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []
-has_rdoc: