Hello community, here is the log from the commit of package ruby-common for openSUSE:Factory checked in at 2012-08-04 09:33:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-common (Old) and /work/SRC/openSUSE:Factory/.ruby-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby-common", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2012-07-30 20:40:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes 2012-08-04 09:34:00.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 1 10:20:32 UTC 2012 - [email protected] + +- fixing the pessimistic operator + +------------------------------------------------------------------- +Mon Jul 30 10:39:16 UTC 2012 - [email protected] + +- replace all */ruby with /usr/bin/ruby + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-common.spec ++++++ --- /var/tmp/diff_new_pack.UX9j1Y/_old 2012-08-04 09:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.UX9j1Y/_new 2012-08-04 09:34:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ruby +# spec file for package ruby-common # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,9 +28,9 @@ Summary: Collection of scripts and macros for ruby packaging License: MIT Group: Development/Languages/Ruby -Requires: rubygems_with_buildroot_patch -Requires: rubygems > 1.8 Requires: /usr/bin/getopt +Requires: rubygems > 1.8 +Requires: rubygems_with_buildroot_patch BuildArch: noarch Provides: ruby-macros = %{version} %if %suse_version < 1140 ++++++ gem_install.sh ++++++ --- /var/tmp/diff_new_pack.UX9j1Y/_old 2012-08-04 09:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.UX9j1Y/_new 2012-08-04 09:34:01.000000000 +0200 @@ -1,5 +1,7 @@ #! /bin/bash +set -e + # options may be followed by one colon to indicate they have a required argument if ! options=$(getopt -o dEf -l ignore-dependencies,force,no-rdoc,rdoc,no-ri,ri,env-shebang,no-env-shebang,default-gem:,build-root:,gem-binary: -- "$@") then @@ -40,7 +42,7 @@ $gem_binary install --verbose --local $otheropts if test -d $RPM_BUILD_ROOT/usr/bin; then cd $RPM_BUILD_ROOT/usr/bin - bins=`ls -1 *1.9 2> /dev/null` + bins=`ls -1 *1.9 2> /dev/null` || true if test -n "$bins"; then for bin in $bins; do mv -v $bin $(echo "$bin" | sed -e 's,1.9$,,') @@ -50,6 +52,7 @@ if [ -d "$buildroot" ]; then find $buildroot -type f -perm /u+x | while read file; do - sed -i -e 's,#!/usr/local/bin/ruby,#!/usr/bin/ruby,' "$file" + # TODO: scripts in ruby/1.9.1 should call ruby1.9 for consistency + sed -i -e 's,^#!/usr/bin/env ruby,#!/usr/bin/ruby,; s,^#! *[^ ]*/ruby,#!/usr/bin/ruby,' "$file" done fi ++++++ rubygemsdeps.rb ++++++ --- /var/tmp/diff_new_pack.UX9j1Y/_old 2012-08-04 09:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.UX9j1Y/_new 2012-08-04 09:34:01.000000000 +0200 @@ -56,13 +56,18 @@ # old forms puts "rubygem-#{spec.name} = #{spec.version}" versions = spec.version.to_s.split('.') - puts "rubygem-#{spec.name}-#{versions[0]} = #{spec.version}" if versions.length > 0 - puts "rubygem-#{spec.name}-#{versions[0]}_#{versions[1]} = #{spec.version}" if versions.length > 1 - puts "rubygem-#{spec.name}-#{versions[0]}_#{versions[1]}_#{versions[2]} = #{spec.version}" if versions.length > 2 + puts "rubygem-#{spec.name}-#{versions[0]} = #{spec.version}" if versions.length > 1 + puts "rubygem-#{spec.name}-#{versions[0]}_#{versions[1]} = #{spec.version}" if versions.length > 2 + puts "rubygem-#{spec.name}-#{versions[0]}_#{versions[1]}_#{versions[2]} = #{spec.version}" if versions.length > 3 # version without ruby version - asking for trouble puts "rubygem(#{spec.name}) = #{spec.version}" - puts "rubygem(#{rubyabi}:#{spec.name}) = #{spec.version}" if rubyabi + if rubyabi + puts "rubygem(#{rubyabi}:#{spec.name}) = #{spec.version}" + puts "rubygem(#{rubyabi}:#{spec.name}:#{versions[0]}) = #{spec.version}" if versions.length > 1 + puts "rubygem(#{rubyabi}:#{spec.name}:#{versions[0]}.#{versions[1]}) = #{spec.version}" if versions.length > 2 + puts "rubygem(#{rubyabi}:#{spec.name}:#{versions[0]}.#{versions[1]}.#{versions[2]}) = #{spec.version}" if versions.length > 3 + end end if requires @@ -70,9 +75,10 @@ spec.runtime_dependencies.each do |dep| dep.requirement.requirements.each do |r| if r.first == '~>' - next_version = Gem::Version.create(r.last).bump - puts "rubygem(#{rubyabi}:#{dep.name}) >= #{r.last}" - puts "rubygem(#{rubyabi}:#{dep.name}) < #{next_version}" + versions = r.last.to_s.split('.') + versions = versions[0,versions.length-1] + version = versions.join('.') + puts "rubygem(#{rubyabi}:#{dep.name}:#{version}) >= #{r.last}" elsif r.first == '!=' # this is purely guessing, but we can't generate conflicts here ;( puts "rubygem(#{rubyabi}:#{dep.name}) > #{r.last}" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
