Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: jordansissel/fpm
...
head fork: jordansissel/fpm
  • 5 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
10 CHANGELIST
View
@@ -1,3 +1,13 @@
+0.4.8 (April 25, 2012)
+ - RPM: use 'noreplace' option for config files (#194, patch by Steve Lum)
+ - Python: Fix bug around exact dependency versions (#206, patch by Lars van
+ de Kerkhof)
+ - Gem->RPM: Make 'provides' "rubygem(thegemname)" instead of "rubygem-thegemname"
+ - Fix oddity where Ruby would complain about constant redefinition (#198,
+ patch by Marcus Vinicius Ferreira)
+
+0.4.7 skipped.
+
0.4.6 (April 10, 2012)
- Work around more problems in RPM with respect to file listing (#202)
2  fpm.gemspec
View
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
files << "CHANGELIST"
spec.name = "fpm"
- spec.version = "0.4.6"
+ spec.version = "0.4.8"
spec.summary = "fpm - package building and mangling"
spec.description = "Convert directories, rpms, python eggs, rubygems, and " \
"more to rpms, debs, solaris packages and more. Win at package " \
2  lib/fpm/package/gem.rb
View
@@ -135,7 +135,7 @@ def load_package_info(gem_path)
# By default, we'll usually automatically provide this, but in the case that we are
# composing multiple packages, it's best to explicitly include it in the provides list.
- self.provides << "rubygem-#{self.name}"
+ self.provides << "#{self.name}"
spec.runtime_dependencies.map do |dep|
# rubygems 1.3.5 doesn't have 'Gem::Dependency#requirement'
14 lib/fpm/package/rpm.rb
View
@@ -98,6 +98,20 @@ def converted_from(origin)
end
end
self.dependencies = fixed_deps
+
+ # Convert 'rubygem-foo' provides values to 'rubygem(foo)'
+ # since that's what most rpm packagers seem to do.
+ self.provides = self.provides.collect do |provides|
+ first, remainder = provides.split("-", 2)
+ if first == "rubygem"
+ name, remainder = remainder.split(" ", 2)
+ # yield rubygem(name)...
+ "rubygem(#{name})#{remainder ? " #{remainder}" : ""}"
+ else
+ provides
+ end
+ end
+ #self.provides << "rubygem(#{self.name})"
end
end # def converted

No commit comments for this range

Something went wrong with that request. Please try again.