Lots of improvements to the Ruby 1.9.1 spec

1 files changed, 59 insertions, 45 deletions

diff --git a/ruby-1.9.1.spec b/ruby-1.9.1.spec
index 46b3534..ec7c702 100644
--- a/ruby-1.9.1.spec
+++ b/ruby-1.9.1.spec
@@ -33,43 +33,45 @@
 
 %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:            8%{?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.9.1-p243-openssl-1.0.patch
-Patch1:         ruby-1.9.1-p243-always-use-i386.patch
-Patch2:         ruby-1.9.1-p243-mmt-searchpath.patch
+Patch0:             ruby-1.9.1-p243-openssl-1.0.patch
+Patch1:             ruby-1.9.1-p243-always-use-i386.patch
+Patch2:             ruby-1.9.1-p243-mmt-searchpath.patch
 
-Summary:        An interpreter of object-oriented scripting language
-Group:          Development/Languages
-Requires:       %{name}-libs = %{version}-%{release}
+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
@@ -84,7 +86,6 @@ straight-forward, and extensible.
 Summary:    A Ruby development environment
 Group:      Development/Languages
 Requires:   %{name}-libs = %{version}-%{release}
-Requires:   %{name}-static = %{version}-%{release}
 
 %description devel
 Header files and libraries for building a extension library for the
@@ -97,8 +98,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) = %{rubymmtver}
+Provides:   ruby(irb) = %{rubymmtver}
 
 %description irb
 The irb is acronym for Interactive Ruby.  It evaluates ruby expression
@@ -111,12 +112,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.
@@ -139,9 +138,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.
@@ -155,9 +154,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
@@ -212,6 +211,7 @@ export CFLAGS
     --with-vendordir='%{ruby_vendorlib}' \
     --with-vendorarchdir='%{ruby_vendorarch}' \
     --program-suffix='%{?_compatsuffix}' \
+    --with-rubyhdrdir='%{_includedir}/ruby%{?_compatsuffix}' \
     --enable-shared \
     --enable-pthread \
     --disable-rpath \
@@ -251,6 +251,16 @@ fi
 %clean
 rm -rf %{buildroot}
 
+%post
+%{_sbindir}/alternatives --install %{_bindir}/ruby ruby %{_bindir}/ruby%{?_compatsuffix} 90 \
+    --slave %{_bindir}/gem ruby-gem %{_bindir}/gem%{?_compatsuffix} \
+    --slave %{_bindir}/rake ruby-rake %{_bindir}/rake%{?_compatsuffix}
+
+%preun
+if [ $1 = 0 ]; then
+    %{_sbindir}/alternatives --remove ruby %{_bindir}/ruby%{?_compatsuffix}
+fi
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -381,5 +391,9 @@ rm -rf %{buildroot}
 %{ruby_vendorarch_191}/tkutil.so
 
 %changelog
+* Thu Dec 24 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.9.1-376-9
+- Remove -devel requirement for -static
+- Fix header directory (Ben Shakal)
+
 * Mon Dec 21 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.9.1-376-6
 - New upstream version