fpm 0.2.20 → 0.2.21

data/bin/fpm

@@ -118,6 +118,11 @@ def main(args)
             "Add a description for this package.") do |description|
       settings.description = description
     end # --description
+
+    opts.on("--url URL",
+            "Add a url for this package.") do |url|
+      settings.url = url
+    end # --url
   end # OptionParser
 
   opts.parse!(args)

data/lib/fpm/builder.rb

@@ -40,7 +40,8 @@ class FPM::Builder
       :exclude => settings.exclude,
       :maintainer => settings.maintainer,
       :provides => [],
-      :description => settings.description
+      :description => settings.description,
+      :url => settings.url
     )
 
     @edit = !!settings.edit

data/templates/deb.erb

@@ -38,4 +38,4 @@ Section: <%= category or "unknown" %>
 Priority: extra
 Homepage: <%= url or "http://nourlgiven.example.com/" %>
 Description: <%= description or "no description given" %>
-  <%= description or "no description given"%>
+

data/templates/rpm.erb

@@ -4,7 +4,8 @@ Version: <%= version %>
 Epoch: <%= epoch %>
 <% end %>
 Release: <%= iteration or 1 %>
-Summary: <%= description %>
+<%# use the first line of the description as the summary %>
+Summary: <%= description.split("\n").first %>
 BuildArch: <%= architecture %>
 AutoReqProv: no
 
@@ -14,6 +15,7 @@ TODO: [Jay] rpms require a license
 let's detect it intelligently
 %>
 License: <%= license %> 
+URL: <%= url or "http://nourlgiven.example.com/" %>
 Source0:  %{_sourcedir}/data.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -44,8 +46,10 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides: <%= prov %>
 <% end %>
 
+<%# rpm rejects descriptions with blank lines (even between content), so hack
+    around it by replacing blank lines with ' .' %>
 %description
-<%= description %>
+<%= description.gsub(/^\s*$/, " .") %>
 
 %prep
 echo "PREP"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 61
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 20
-  version: 0.2.20
+  - 21
+  version: 0.2.21
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -07:00
+date: 2011-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling