From cd6aa0e02c88d05d0c8e1b7fc1fe078e12654f44 Mon Sep 17 00:00:00 2001 From: Jeroen van Meeuwen Date: Sat, 20 Jun 2009 17:50:59 +0000 Subject: [PATCH] 1.8.6.368-2 --- .cvsignore | 2 +- import.log | 1 + ruby.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 36ef766..1f1c551 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ +ruby-1.8.6-p368.tar.bz2 ruby-refm-rdp-1.8.2-ja-html.tar.gz rubyfaq-990927.tar.gz rubyfaq-jp-990927.tar.gz -ruby-1.8.6-p368.tar.bz2 diff --git a/import.log b/import.log index e87e717..d2dcbe1 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ ruby-1_8_6_287-4_fc10:HEAD:ruby-1.8.6.287-4.fc10.src.rpm:1237096558 ruby-1_8_6_287-5_fc10:HEAD:ruby-1.8.6.287-5.fc10.src.rpm:1237096677 ruby-1_8_6_287-7_fc11:HEAD:ruby-1.8.6.287-7.fc11.src.rpm:1237351812 ruby-1_8_6_368-1_fc11:HEAD:ruby-1.8.6.368-1.fc11.src.rpm:1243759307 +ruby-1_8_6_368-2_fc11:HEAD:ruby-1.8.6.368-2.fc11.src.rpm:1245520186 diff --git a/ruby.spec b/ruby.spec index c0e342f..88901d0 100644 --- a/ruby.spec +++ b/ruby.spec @@ -16,7 +16,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -130,7 +130,7 @@ Manuals and FAQs for the object-oriented scripting language Ruby. %package mode -Summary: Emacs Lisp ruby-mode for the scripting language Ruby +Summary: Emacs Lisp for the scripting language Ruby Group: Applications/Editors Requires: emacs-common @@ -405,8 +405,12 @@ rm -rf $RPM_BUILD_ROOT %dir %{_prefix}/lib/ruby %dir %{_prefix}/lib/ruby/%{rubyxver} %ifnarch ppc64 s390x sparc64 x86_64 +%if "%{_gnu}" == "-gnueabi" +%dir %{_prefix}/lib/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}-eabi +%else %dir %{_prefix}/lib/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os} %endif +%endif %ifarch ppc64 s390x sparc64 x86_64 %dir %{_libdir}/ruby %dir %{_libdir}/ruby/%{rubyxver} @@ -531,6 +535,9 @@ rm -rf $RPM_BUILD_ROOT %{_emacs_sitestartdir}/ruby-mode-init.el %changelog +* Sat Jun 20 2009 Jeroen van Meeuwen - 1.8.6.368-2 +- Fix directory on ARM (#506233, Kedar Sovani) + * Sun May 31 2009 Jeroen van Meeuwen - 1.8.6.368-1 - New upstream release (p368) diff --git a/sources b/sources index 63ec757..62029b4 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ +623447c6d8c973193aae565a5538ccfc ruby-1.8.6-p368.tar.bz2 b6dd396f513efeb7864685c840f9643a ruby-refm-rdp-1.8.2-ja-html.tar.gz 634c25b14e19925d10af3720d72e8741 rubyfaq-990927.tar.gz 4fcec898f51d8371cc42d0a013940469 rubyfaq-jp-990927.tar.gz -623447c6d8c973193aae565a5538ccfc ruby-1.8.6-p368.tar.bz2