summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ruby-1.8.6.spec39
1 files changed, 35 insertions, 4 deletions
diff --git a/ruby-1.8.6.spec b/ruby-1.8.6.spec
index fb7a797..d7cb2a6 100644
--- a/ruby-1.8.6.spec
+++ b/ruby-1.8.6.spec
@@ -5,7 +5,7 @@
# The Major.Minor.Teeny version
%global rubymmtver 1.8.6
# The patchlevel
-%global _patchlevel 383
+%global _patchlevel 388
##
## Safety net for missing /etc/rpm/macros.ruby
@@ -37,7 +37,7 @@ Name: ruby%{?_compatsuffix}
Version: %{_patchlevel}
-Release: 11%{?dist}
+Release: 1%{?dist}
License: Ruby or GPLv2
URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -86,6 +86,7 @@ Group: Development/Languages
Requires: %{name}-libs = %{version}-%{release}
Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
+Provides: /usr/bin/ruby
%description
Ruby is the interpreted scripting language for quick and easy
@@ -274,15 +275,35 @@ done
if [ ! -d %{buildroot}/%{_includedir}/%{name}/ ]; then
# The headers are probably in the vendor arch dir
mkdir -p %{buildroot}/%{_includedir}/%{name}/
- find %{buildroot}/%{ruby_vendorarch} -mindepth 1 -maxdepth 1 -type f ! -name "*.so" -exec mv -v {} %{buildroot}/%{_includedir}/%{name}/. \;
+ find %{buildroot}/%{ruby_vendorarch_186} -mindepth 1 -maxdepth 1 -type f ! -name "*.so" ! -name "rbconfig.rb" -exec mv -v {} %{buildroot}/%{_includedir}/%{name}/. \;
fi
+
%clean
rm -rf %{buildroot}
+%post
+%{_sbindir}/alternatives --install %{_bindir}/ruby ruby %{_bindir}/ruby%{?_compatsuffix} 80 \
+ --slave %{_bindir}/erb ruby-erb %{_bindir}/erb%{?_compatsuffix} \
+ --slave %{_bindir}/testrb ruby-testrb %{_bindir}/testrb%{?_compatsuffix} \
+ --slave %{_mandir}/man1/ruby.1.gz rubyman %{_mandir}/man1/ruby%{?_compatsuffix}.1.gz
+
+%preun
+if [ $1 = 0 ]; then
+ %{_sbindir}/alternatives --remove ruby %{_bindir}/ruby%{?_compatsuffix}
+fi
+
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+%post rdoc
+%{_sbindir}/alternatives --install %{_bindir}/rdoc ruby-rdoc %{_bindir}/rdoc%{?_compatsuffix} 90
+
+%preun rdoc
+if [ $1 = 0 ]; then
+ %{_sbindir}/alternatives --remove ruby-rdoc %{_bindir}/rdoc%{?_compatsuffix}
+fi
+
%files
%defattr(-, root, root, -)
%doc COPYING*
@@ -308,7 +329,8 @@ rm -rf %{buildroot}
%doc LEGAL
%doc LGPL
%doc README.EXT
-%{_includedir}/ruby-%{rubyabiver}
+%dir %{_includedir}/ruby%{?_compatsuffix}
+%{_includedir}/ruby%{?_compatsuffix}/*.h
%{_libdir}/libruby%{?_compatsuffix}.so
%files irb
@@ -401,6 +423,15 @@ rm -rf %{buildroot}
%{ruby_vendorarch_186}/tkutil.so
%changelog
+* Tue Jan 19 2010 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.8.6-388-1
+- New upstream patchlevel update
+
+* Mon Jan 11 2010 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.8.6-383-13
+- Fix the install scripts
+
+* Sat Jan 2 2010 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.8.6-383-12
+- Header files should be in %%{_includedir}
+
* Mon Dec 28 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.8.6-383-11
- Align packaging with ruby-1.9.1