From 29f5bdd8006aafb3cde50c7689313e65b3d4e161 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Fedora Unity)" Date: Sat, 2 Jan 2010 14:20:27 +0100 Subject: Align the ruby-1.8.6.spec with the ruby-1.9.1.spec --- ruby-1.8.6.spec | 119 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 61 insertions(+), 58 deletions(-) diff --git a/ruby-1.8.6.spec b/ruby-1.8.6.spec index aa19878..fb7a797 100644 --- a/ruby-1.8.6.spec +++ b/ruby-1.8.6.spec @@ -33,57 +33,59 @@ %global _normalized_cpu %(echo `echo %{_target_cpu} | sed 's/^ppc/powerpc/'`) -Name: ruby%{?_compatsuffix} - -Version: %{_patchlevel} - -Release: 6%{?dist} -License: Ruby or GPLv2 -URL: http://www.ruby-lang.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf -BuildRequires: bison -BuildRequires: byacc -BuildRequires: db4-devel -BuildRequires: emacs -BuildRequires: gdbm-devel -BuildRequires: glibc-devel -BuildRequires: libX11-devel -BuildRequires: ncurses-devel -BuildRequires: openssl-devel +Name: ruby%{?_compatsuffix} + +Version: %{_patchlevel} + +Release: 11%{?dist} +License: Ruby or GPLv2 +URL: http://www.ruby-lang.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: byacc +BuildRequires: db4-devel +BuildRequires: emacs +BuildRequires: gdbm-devel +BuildRequires: glibc-devel +BuildRequires: libX11-devel +BuildRequires: ncurses-devel +BuildRequires: openssl-devel %if 0%{?fedora} >= 12 -BuildRequires: compat-readline5-devel +BuildRequires: compat-readline5-devel %else -BuildRequires: readline-devel +BuildRequires: readline-devel %endif -BuildRequires: unzip -BuildRequires: tcl-devel -BuildRequires: tk-devel +BuildRequires: unzip +BuildRequires: tcl-devel +BuildRequires: tk-devel -Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{rubymmver}/ruby-%{arcver}.tar.gz +Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{rubymmver}/ruby-%{arcver}.tar.gz # These patches actually make sense -Patch0: ruby-1.8.6-p383-openssl-1.0.patch -Patch1: ruby-1.8.6-p383-always-use-i386.patch -Patch2: ruby-1.8.6-p383-mmt-searchpath.patch +Patch0: ruby-1.8.6-p383-openssl-1.0.patch +Patch1: ruby-1.8.6-p383-always-use-i386.patch +Patch2: ruby-1.8.6-p383-mmt-searchpath.patch # Weird patches -Patch101: ruby-deadcode.patch -Patch102: ruby-1.8.6-p383-rubyprefix.patch -Patch103: ruby-deprecated-sitelib-search-path.patch -Patch104: ruby-deprecated-search-path.patch -Patch105: ruby-multilib.patch +Patch101: ruby-deadcode.patch +Patch102: ruby-1.8.6-p383-rubyprefix.patch +Patch103: ruby-deprecated-sitelib-search-path.patch +Patch104: ruby-deprecated-search-path.patch +Patch105: ruby-multilib.patch # Again these patches make sense -Patch201: ruby-1.8.6-p287-CVE-2008-5189.patch -Patch202: ruby-1.8.6-p287-remove-ssl-rand-range.patch -Patch203: ruby-1.8.6-p369-ri-gem_multipath.patch -Patch204: ruby-1.8.6-p383-head-irb-save-history.patch -Patch205: ruby-1.8.6-p383-mkmf-use-shared.patch - -Summary: An interpreter of object-oriented scripting language -Group: Development/Languages -Requires: %{name}-libs = %{version}-%{release} +Patch201: ruby-1.8.6-p287-CVE-2008-5189.patch +Patch202: ruby-1.8.6-p287-remove-ssl-rand-range.patch +Patch203: ruby-1.8.6-p369-ri-gem_multipath.patch +Patch204: ruby-1.8.6-p383-head-irb-save-history.patch +Patch205: ruby-1.8.6-p383-mkmf-use-shared.patch + +Summary: An interpreter of object-oriented scripting language +Group: Development/Languages +Requires: %{name}-libs = %{version}-%{release} +Requires(post): %{_sbindir}/alternatives +Requires(postun): %{_sbindir}/alternatives %description Ruby is the interpreted scripting language for quick and easy @@ -98,7 +100,8 @@ straight-forward, and extensible. Summary: A Ruby development environment Group: Development/Languages Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-static = %{version}-%{release} +Provides: ruby(devel) = %{rubymmver} +Provides: ruby(devel) = %{rubymmtver} %description devel Header files and libraries for building a extension library for the @@ -111,8 +114,8 @@ Ruby or an application embedded Ruby. Summary: The Interactive Ruby Group: Development/Languages Requires: %{name} = %{version}-%{release} -Provides: irb = %{rubyabiver} -Obsoletes: irb <= %{rubyabiver} +Provides: ruby(irb) = %{rubymmver} +Provides: ruby(irb) = %{rubymmtver} %description irb The irb is acronym for Interactive Ruby. It evaluates ruby expression @@ -125,12 +128,10 @@ from the terminal. Summary: Libraries necessary to run Ruby Group: Development/Libraries # Always offer both the rubymmver and rubymmtver Ruby ABI -Provides: ruby(ABI) = %{rubymmver} -Provides: ruby(ABI) = %{rubymmtver} -Provides: ruby(API) = %{rubymmver} -Provides: ruby(API) = %{rubymmtver} -Provides: libruby = %{version}-%{release} -Obsoletes: libruby <= %{version}-%{release} +Provides: ruby(abi) = %{rubymmver} +Provides: ruby(abi) = %{rubymmtver} +Provides: ruby(api) = %{rubymmver} +Provides: ruby(api) = %{rubymmtver} %description libs This package includes the libruby, necessary to run Ruby. @@ -153,9 +154,9 @@ Emacs Lisp ruby-mode for the object-oriented scripting language Ruby. Summary: A tool to generate documentation from Ruby source files Group: Development/Languages Requires: %{name} = %{version}-%{release} -Requires: %{name}-irb = %{version}-%{release} -Provides: rdoc = %{rubyabiver} -Obsoletes: rdoc <= %{rubyabiver} +Requires: ruby(irb) = %{rubymmtver} +Provides: ruby(rdoc) = %{rubymmver} +Provides: ruby(rdoc) = %{rubymmtver} %description rdoc The rdoc is a tool to generate the documentation from Ruby source files. @@ -169,9 +170,9 @@ XML and Windows Help file (chm). Summary: Ruby interactive reference Group: Documentation Requires: %{name} = %{version}-%{release} -Requires: %{name}-rdoc = %{version}-%{release} -Provides: ri = %{rubyabiver} -Obsoletes: ri <= %{rubyabiver} +Requires: ruby(rdoc) = %{rubymmtver} +Provides: ruby(ri) = %{rubymmver} +Provides: ruby(ri) = %{rubymmtver} %description ri ri is a command line tool that displays descriptions of built-in @@ -186,8 +187,7 @@ along with a list of the methods the class or module implements. Summary: Static libraries for Ruby Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} -Provides: %{name}-libs-static = %{version}-%{release} +Requires: ruby(devel) = %{rubymmtver} %description static Static libraries for Ruby @@ -401,5 +401,8 @@ rm -rf %{buildroot} %{ruby_vendorarch_186}/tkutil.so %changelog +* Mon Dec 28 2009 Jeroen van Meeuwen - 1.8.6-383-11 +- Align packaging with ruby-1.9.1 + * Mon Dec 21 2009 Jeroen van Meeuwen - 1.8.6-383-6 - New upstream version -- cgit