|
|
@@ -1,6 +1,6 @@
|
|
|
%define rubyxver 1.8
|
|
|
%define rubyyver 7
|
|
|
-%define rubypl 334
|
|
|
+%define rubypl 358
|
|
|
%define rubyver %{rubyxver}.%{rubyyver}-p%{rubypl}
|
|
|
%define rpmver %{rubyxver}.%{rubyyver}.%{rubypl}
|
|
|
%define rpmrel 1%{?_dist_release}
|
|
|
@@ -49,14 +49,16 @@ Patch803: ruby-1.8.6.111-soap-massmem.patch
|
|
|
Patch808: ruby-1.8.6.287-rexml-document-transitive.patch
|
|
|
Patch901: ruby-1.8.6.111-ri-pager.patch
|
|
|
Patch903: ruby-1.8.6.111-rdoc-documents.patch
|
|
|
-Patch950: ruby-1.8.7-p72-multilib.patch
|
|
|
+Patch950: ruby-1.8.7-p358-multilib.patch
|
|
|
Patch960: ruby-1.8.7-rubyprefix.patch
|
|
|
# patches from debian package
|
|
|
Patch1005: 090812_openssl_x509_warning.dpatch
|
|
|
+# to build with glibc-2.14
|
|
|
+Patch1100: ruby-1.8.7-p358-stdout-rouge-fix.patch
|
|
|
|
|
|
URL: http://www.ruby-lang.org/
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
-BuildPreReq: sed autoconf bison unzip
|
|
|
+BuildRequires: sed autoconf bison unzip
|
|
|
BuildRequires: readline-devel
|
|
|
BuildRequires: ncurses-devel
|
|
|
BuildRequires: db4-devel
|
|
|
@@ -198,7 +200,8 @@ Manuals and FAQs for the object-oriented scripting language Ruby.
|
|
|
%package -n %{rbmode_el}
|
|
|
Summary: Emacs-lisp ruby-mode for the scripting language Ruby
|
|
|
Group: Applications/Editors/Emacs
|
|
|
-PreReq: emacsen, emacsen-common >= 0.1
|
|
|
+Requires(post): emacsen, emacsen-common >= 0.1
|
|
|
+Requires(preun): emacsen, emacsen-common >= 0.1
|
|
|
URL: http://www.ruby-lang.org/
|
|
|
|
|
|
%description -n %{rbmode_el}
|
|
|
@@ -227,6 +230,8 @@ cd %{name}-%{rubysrcdir}
|
|
|
%patch960 -p1
|
|
|
%patch1005 -p1
|
|
|
|
|
|
+%patch1100 -p1
|
|
|
+
|
|
|
cd ../../..
|
|
|
|
|
|
|
|
|
@@ -326,6 +331,7 @@ mv ../libruby/ext/tk/README.* .
|
|
|
mv ../libruby/ext/tk/lib/README README.lib
|
|
|
mv ../libruby/ext/tk/lib/tkextlib .
|
|
|
mv ../libruby/ext/tk/sample .
|
|
|
+mv ../libruby/ext/tk/old-extconf.rb .
|
|
|
|
|
|
rmdir ../libruby/ext/tk/lib
|
|
|
rmdir ../libruby/ext/tk
|
|
|
@@ -566,6 +572,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun May 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.7.358-1
|
|
|
+- update to 1.8.7-p358
|
|
|
+- add patch1100 to build with glibc-2.14
|
|
|
+
|
|
|
* Mon Feb 28 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.7.334-1
|
|
|
- update to 1.8.7-p334
|
|
|
|
daisuke