"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/fpm/package/rpm.rb" between
fpm-1.13.1.tar.gz and fpm-1.14.0.tar.gz

About: fpm tries to make it easy and quick to build packages such as rpms, debs, OSX packages, etc.

rpm.rb  (fpm-1.13.1)	:	rpm.rb  (fpm-1.14.0)
skipping to change at line 256		skipping to change at line 256
when "all"		when "all"
# Translate fpm "all" arch to what it means in RPM.		# Translate fpm "all" arch to what it means in RPM.
return "noarch"		return "noarch"
else		else
return @architecture		return @architecture
end		end
end # def architecture		end # def architecture
# This method ensures a default value for iteration if none is provided.		# This method ensures a default value for iteration if none is provided.
def iteration		def iteration
		if @iteration.kind_of?(String) and @iteration.include?("-")
		logger.warn("Package iteration '#{@iteration}' includes dashes, converting
		" \
		" to underscores. rpmbuild does not allow the dashes in the p
		ackage iteration (called 'Release' in rpm)")
		@iteration = @iteration.gsub(/-/, "_")
		end
return @iteration ? @iteration : 1		return @iteration ? @iteration : 1
end # def iteration		end # def iteration
# See FPM::Package#converted_from		# See FPM::Package#converted_from
def converted_from(origin)		def converted_from(origin)
if origin == FPM::Package::Gem		if origin == FPM::Package::Gem
fixed_deps = []		fixed_deps = []
self.dependencies.collect do |dep|		self.dependencies.collect do |dep|
# Gem dependency operator "~>" is not compatible with rpm. Translate any found.		# Gem dependency operator "~>" is not compatible with rpm. Translate any found.
fixed_deps = fixed_deps + expand_pessimistic_constraints(dep)		fixed_deps = fixed_deps + expand_pessimistic_constraints(dep)
End of changes. 1 change blocks.
0 lines changed or deleted		8 lines changed or added

---