From 04279151c4e2ceaa1745403a6e64f97fa81aee255c607502d479406abede6ecb Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 29 Jan 2010 19:53:59 +0000 Subject: [PATCH] Accepting request 30840 from devel:languages:ruby Copy from devel:languages:ruby/ruby based on submit request 30840 from user darix OBS-URL: https://build.opensuse.org/request/show/30840 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ruby?expand=0&rev=12 --- ruby.changes | 12 ++++++++++++ ruby.macros | 2 +- ruby.spec | 25 ++++++++++++++++--------- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/ruby.changes b/ruby.changes index ac43364..9a18ea5 100644 --- a/ruby.changes +++ b/ruby.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Thu Aug 20 19:19:52 UTC 2009 - jansimon.moeller@opensuse.org diff --git a/ruby.macros b/ruby.macros index 9ebc18c..fef345f 100644 --- a/ruby.macros +++ b/ruby.macros @@ -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/ diff --git a/ruby.spec b/ruby.spec index 06475bf..bc5973f 100644 --- a/ruby.spec +++ b/ruby.spec @@ -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 @@ Authors: Yukihiro Matsumoto %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 @@ Authors: Yukihiro Matsumoto %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 @@ Authors: Yukihiro Matsumoto %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 @@ Authors: Yukihiro Matsumoto %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 @@ Authors: Yukihiro Matsumoto %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 @@ Authors: Yukihiro Matsumoto %package test-suite -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: An Interpreted Object-Oriented Scripting Language