Hello community, here is the log from the commit of package rubygems for openSUSE:Factory checked in at Fri Apr 16 01:36:41 CEST 2010. -------- --- rubygems/rubygems.changes 2009-09-29 18:56:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/rubygems/rubygems.changes 2010-04-13 12:22:10.000000000 +0200 @@ -1,0 +2,63 @@ +Mon Apr 12 23:57:34 UTC 2010 - mrueckert@suse.de + +- added rubygems-1.3.6_version_requirements.patch: + add back Gem::Dependency#version_requirements to fix older rails + versions. + +------------------------------------------------------------------- +Sat Mar 6 12:21:16 UTC 2010 - dmacvicar@novell.com + +- update to rubygems 1.3.6 + Notes: + - http://rubygems.org is now the default source for downloading + gems. + - You may have sources set via ~/.gemrc, so you should replace + - http://gems.rubyforge.org with http://rubygems.org + - http://gems.rubyforge.org will continue to work for the + forseeable future. + New features: + - `gem` commands + - Added `gem push` and `gem owner` for interacting with + modern/Gemcutter + sources + - `gem dep` now supports --prerelease. + - `gem fetch` now supports --prerelease. + - `gem server` now supports --bind. Patch #27357 by Bruno + Michel. + - `gem rdoc` no longer overwrites built documentation. + Use --overwrite force rebuilding. Patch #25982 by Akinori + MUSHA. + - Captial letters are now allowed in prerelease versions. + Bug fixes: + - Development deps are no longer added to rubygems-update gem so + older versions can update sucessfully. + Installer bugs: + - Prerelease gems can now depend on non-prerelease gems. + - Development dependencies are ignored unless explicitly needed. + Bug #27608 + by Roger Pack. + - `gem` commands + - `gem which` now fails if no paths were found. Adapted patch + #27681 by Caio Chassot. + - `gem server` no longer has invalid markup. Bug #27045 by + Eric Young. + - `gem list` and friends show both prerelease and regular gems + when --prerelease --all is given + - Gem::Format no longer crashes on empty files. Bug #27292 + by Ian Ragsdale. + - Gem::GemPathSearcher handles nil require_paths. + Patch #27334 by Roger Pack. + - Gem::RemoteFetcher no longer copies the file if it is where we + want it. Patch #27409 by Jakub Šťastný. + Deprecation Notices: + - lib/rubygems/timer.rb has been removed. + - Gem::Dependency#version_requirements is deprecated and will be + removed on or after August 2010. + - Bulk index update is no longer supported. + - Gem::manage_gems was removed in 1.3.3. + - Time::today was removed in 1.3.3. +- updated buildroot patch for 1.3.6: + old name rubygems-1.3.5_buildroot.patch + new name rubygems-1.3.6_buildroot.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rubygems-1.3.5.tar.bz2 rubygems-1.3.5_buildroot.patch New: ---- rubygems-1.3.6.tar.bz2 rubygems-1.3.6_buildroot.patch rubygems-1.3.6_version_requirements.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygems.spec ++++++ --- /var/tmp/diff_new_pack.F3e7Yt/_old 2010-04-16 01:34:14.000000000 +0200 +++ /var/tmp/diff_new_pack.F3e7Yt/_new 2010-04-16 01:34:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rubygems (Version 1.3.5) +# spec file for package rubygems (Version 1.3.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: rubygems -Version: 1.3.5 +Version: 1.3.6 Release: 1 # License: Other uncritical OpenSource License @@ -31,12 +31,13 @@ Provides: rubygems_with_buildroot_patch # Url: http://rubyforge.org/projects/rubygems/ -# from http://rubyforge.org/frs/download.php/60718/rubygems-1.3.5.tgz +# from http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz Source: rubygems-%{version}.tar.bz2 Source1: gem_build_cleanup Source2: rubygems-rpmlintrc Source3: rubygems.macros -Patch: rubygems-1.3.5_buildroot.patch +Patch: rubygems-1.3.6_buildroot.patch +Patch1: rubygems-1.3.6_version_requirements.patch Summary: The Ruby standard for publishing and managing third party libraries %description @@ -66,6 +67,7 @@ %prep %setup -n %{name}-%{version} %patch +%patch1 find test -type f -perm 0755 -print0 | xargs -r0 chmod -v a-x find -name '._*' -print -delete @@ -76,6 +78,10 @@ ruby -rvendor-specific setup.rb --destdir=%{buildroot} %{__install} -D -m 0755 %{S:1} %{buildroot}%{_bindir}/gem_build_cleanup %{__install} -D -m 0644 %{S:3} %{buildroot}/etc/rpm/macros.rubygems +%{__mkdir_p} %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/cache/ +%{__mkdir_p} %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/doc/ +%{__mkdir_p} %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/ +%{__mkdir_p} %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/specifications/ %clean %{__rm} -rf %{buildroot}; @@ -97,6 +103,6 @@ %dir %{_libdir}/ruby/gems/%{rb_ver}/doc/ %dir %{_libdir}/ruby/gems/%{rb_ver}/gems/ %dir %{_libdir}/ruby/gems/%{rb_ver}/specifications/ -%{_libdir}/ruby/gems/%{rb_ver}/doc/rubygems-%{version} +#%{_libdir}/ruby/gems/%{rb_ver}/doc/rubygems-%{version} %changelog ++++++ rubygems-1.3.5.tar.bz2 -> rubygems-1.3.6.tar.bz2 ++++++ ++++ 9700 lines of diff (skipped) ++++++ rubygems-1.3.5_buildroot.patch -> rubygems-1.3.6_buildroot.patch ++++++ --- rubygems/rubygems-1.3.5_buildroot.patch 2009-09-29 18:56:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/rubygems/rubygems-1.3.6_buildroot.patch 2010-04-13 12:22:09.000000000 +0200 @@ -1,25 +1,28 @@ -Index: lib/rubygems/install_update_options.rb +Index: lib/rubygems/dependency_installer.rb =================================================================== ---- lib/rubygems/install_update_options.rb.orig 2009-06-23 00:54:36.000000000 +0200 -+++ lib/rubygems/install_update_options.rb 2009-09-29 18:41:37.264306000 +0200 -@@ -34,6 +34,12 @@ module Gem::InstallUpdateOptions - options[:bin_dir] = File.expand_path(value) - end +--- lib/rubygems/dependency_installer.rb.orig ++++ lib/rubygems/dependency_installer.rb +@@ -68,6 +68,7 @@ class Gem::DependencyInstaller + @installed_gems = [] -+ add_option(:"Install/Update", '--build-root DIR', -+ 'Temporary installation root. Useful for building', -+ 'packages. Do not use this when installing remote gems.') do |value, options| -+ options[:build_root] = File.expand_path(value) -+ end -+ - add_option(:"Install/Update", '-d', '--[no-]rdoc', - 'Generate RDoc documentation for the gem on', - 'install') do |value, options| + @install_dir = options[:install_dir] || Gem.dir ++ @build_root = options[:build_root] + @cache_dir = options[:cache_dir] || @install_dir + end + +@@ -262,6 +263,7 @@ class Gem::DependencyInstaller + :format_executable => @format_executable, + :ignore_dependencies => @ignore_dependencies, + :install_dir => @install_dir, ++ :build_root => @build_root, + :security_policy => @security_policy, + :source_index => @source_index, + :user_install => @user_install, Index: lib/rubygems/installer.rb =================================================================== ---- lib/rubygems/installer.rb.orig 2009-06-23 00:54:36.000000000 +0200 -+++ lib/rubygems/installer.rb 2009-09-29 18:34:34.642131000 +0200 -@@ -114,6 +114,7 @@ class Gem::Installer +--- lib/rubygems/installer.rb.orig ++++ lib/rubygems/installer.rb +@@ -113,6 +113,7 @@ class Gem::Installer @bin_dir = options[:bin_dir] @development = options[:development] @source_index = options[:source_index] @@ -27,21 +30,8 @@ begin @format = Gem::Format.from_file_by_path @gem, @security_policy -@@ -127,10 +128,10 @@ class Gem::Installer - # We'll divert to ~/.gems below - end - -- if not File.writable? @gem_home or -+ if @build_root.nil? and (not File.writable? @gem_home or - # TODO: Shouldn't have to test for existence of bindir; tests need it. - (@gem_home.to_s == Gem.dir and File.exist? Gem.bindir and -- not File.writable? Gem.bindir) then -+ not File.writable? Gem.bindir)) then - if options[:user_install] == false then # You don't want to use ~ - raise Gem::FilePermissionError, @gem_home - elsif options[:user_install].nil? then -@@ -158,6 +159,13 @@ class Gem::Installer - raise Gem::FilePermissionError, @gem_home unless File.writable? @gem_home +@@ -132,6 +133,13 @@ class Gem::Installer + end end + unless @build_root.nil? @@ -51,26 +41,23 @@ + alert_warning "You build with buildroot.\n Build root: #{@build_root}\n Bin dir: #{@bin_dir}\n Gem home: #{@gem_home}" + end + - @spec = @format.spec + FileUtils.mkdir_p @gem_home + raise Gem::FilePermissionError, @gem_home unless File.writable? @gem_home - @gem_dir = File.join(@gem_home, "gems", @spec.full_name).untaint -Index: lib/rubygems/dependency_installer.rb +Index: lib/rubygems/install_update_options.rb =================================================================== ---- lib/rubygems/dependency_installer.rb.orig 2009-06-23 00:54:36.000000000 +0200 -+++ lib/rubygems/dependency_installer.rb 2009-09-29 18:34:34.768130000 +0200 -@@ -68,6 +68,7 @@ class Gem::DependencyInstaller - @installed_gems = [] - - @install_dir = options[:install_dir] || Gem.dir -+ @build_root = options[:build_root] - @cache_dir = options[:cache_dir] || @install_dir - end +--- lib/rubygems/install_update_options.rb.orig ++++ lib/rubygems/install_update_options.rb +@@ -34,6 +34,12 @@ module Gem::InstallUpdateOptions + options[:bin_dir] = File.expand_path(value) + end -@@ -244,6 +245,7 @@ class Gem::DependencyInstaller - :format_executable => @format_executable, - :ignore_dependencies => @ignore_dependencies, - :install_dir => @install_dir, -+ :build_root => @build_root, - :security_policy => @security_policy, - :source_index => @source_index, - :user_install => @user_install, ++ add_option(:"Install/Update", '--build-root DIR', ++ 'Temporary installation root. Useful for building', ++ 'packages. Do not use this when installing remote gems.') do |value, options| ++ options[:build_root] = File.expand_path(value) ++ end ++ + add_option(:"Install/Update", '-d', '--[no-]rdoc', + 'Generate RDoc documentation for the gem on', + 'install') do |value, options| ++++++ rubygems-1.3.6_version_requirements.patch ++++++ Index: test/test_gem_dependency.rb =================================================================== --- test/test_gem_dependency.rb (revision 2458) +++ test/test_gem_dependency.rb (revision 2459) @@ -134,5 +134,16 @@ assert d.prerelease? end + def test_version_requirements_equals_deprecated + d = dep "pkg", "1.0" + + out, err = capture_io do + d.version_requirements = '2.0' + assert_equal Gem::Requirement.new(%w[2.0]), d.requirement + end + + assert_match %r%deprecated%, err + end + end Index: lib/rubygems/dependency.rb =================================================================== --- lib/rubygems/dependency.rb (revision 2458) +++ lib/rubygems/dependency.rb (revision 2459) @@ -69,9 +69,6 @@ end ## - # What does this dependency require? - - ## # A dependency's hash is the XOR of the hashes of +name+, +type+, # and +requirement+. @@ -106,6 +103,9 @@ end end + ## + # What does this dependency require? + def requirement return @requirement if defined?(@requirement) and @requirement @@ -160,8 +160,17 @@ __requirement end - alias_method :version_requirement, :version_requirements + alias version_requirement version_requirements # :nodoc: + def version_requirements= requirements # :nodoc: + warn "#{Gem.location_of_caller.join ':'}:Warning: " \ + "Gem::Dependency#version_requirements= is deprecated " \ + "and will be removed on or after August 2010. " \ + "Use Gem::Dependency.new." + + @requirement = Gem::Requirement.create requirements + end + def == other # :nodoc: Gem::Dependency === other && self.name == other.name && ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org