Hello community, here is the log from the commit of package ruby for openSUSE:Factory checked in at Fri Jan 29 20:53:57 CET 2010. -------- --- ruby/ruby.changes 2009-08-20 21:20:54.000000000 +0200 +++ ruby/ruby.changes 2009-12-17 14:43:29.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Dec 17 00:42:51 CET 2009 - jengelh@medozas.de + +- package documentation as noarch +- adjust ruby.macros to ask the ruby binary for the target plaform. + This is because %_host_cpu can expand to sparc64, while ruby is + built for the sparcv9 target, and %_target_cpu can expand to + noarch. +- in ruby.spec, %rb_arch is statically reset to %_target_cpu, as + we need the target name. Since it won't be noarch in this case, + that is good. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby.spec ++++++ --- /var/tmp/diff_new_pack.g8EKxN/_old 2010-01-29 20:46:01.000000000 +0100 +++ /var/tmp/diff_new_pack.g8EKxN/_new 2010-01-29 20:46:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ruby (Version 1.8.7.p72) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,14 @@ Name: ruby Version: 1.8.7.p72 -Release: 6 +Release: 7 # %define pkg_version 1.8.7 %define patch_level p72 +%define rb_arch %(echo %{_target_cpu}-linux | sed -e "s/i686/i586/" -e "s/hppa2.0/hppa/") %define rb_ver %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//') # -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -111,7 +112,7 @@ Yukihiro Matsumoto <matz@netlab.co.jp> %package devel -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: Development files to link against Ruby Requires: %{name} = %{version} @@ -130,7 +131,7 @@ Yukihiro Matsumoto <matz@netlab.co.jp> %package tk -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: TCL/TK bindings for Ruby Requires: %{name} = %{version} @@ -145,10 +146,13 @@ Yukihiro Matsumoto <matz@netlab.co.jp> %package doc-ri -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: Ruby Interactive Documentation Requires: %{name} = %{version} +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description doc-ri This package contains the RI docs for ruby @@ -160,9 +164,12 @@ Yukihiro Matsumoto <matz@netlab.co.jp> %package doc-html -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: This package contains the HTML docs for ruby +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description doc-html This package contains the HTML docs for ruby @@ -174,7 +181,7 @@ Yukihiro Matsumoto <matz@netlab.co.jp> %package examples -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: Example scripts for ruby Requires: %{name} = %{version} @@ -189,7 +196,7 @@ Yukihiro Matsumoto <matz@netlab.co.jp> %package test-suite -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: An Interpreted Object-Oriented Scripting Language ++++++ ruby.macros ++++++ --- /var/tmp/diff_new_pack.g8EKxN/_old 2010-01-29 20:46:02.000000000 +0100 +++ /var/tmp/diff_new_pack.g8EKxN/_new 2010-01-29 20:46:02.000000000 +0100 @@ -1,4 +1,4 @@ -%rb_arch %(echo %{_host_cpu}-linux | sed -e "s/i686/i586/" -e "s/hppa2.0/hppa/") +%rb_arch %(/usr/bin/ruby -e 'print RUBY_PLATFORM') %rb_ver %(/usr/bin/ruby -e 'puts VERSION.sub(/\\\.\\\d$/, "")') # %rb_dir %{_libdir}/ruby/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de