Accepting request 70817 from devel:languages:ruby
- drop ruby-1.8.7.p299_webrick_error_page_encoding.patch: we will stick to the upstream charset - added ruby-1.8.x_rubylibdir.patch: allows us to also change the path for the stdlib part of the ruby directory tree OBS-URL: https://build.opensuse.org/request/show/70817 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ruby?expand=0&rev=23
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
a32f4cb29f
@ -1,13 +0,0 @@
|
||||
Index: lib/webrick/httpresponse.rb
|
||||
===================================================================
|
||||
--- lib/webrick/httpresponse.rb.orig 2008-06-06 10:05:24.000000000 +0200
|
||||
+++ lib/webrick/httpresponse.rb 2010-07-01 17:58:35.585190988 +0200
|
||||
@@ -209,7 +209,7 @@ module WEBrick
|
||||
@keep_alive = false
|
||||
self.status = HTTPStatus::RC_INTERNAL_SERVER_ERROR
|
||||
end
|
||||
- @header['content-type'] = "text/html"
|
||||
+ @header['content-type'] = "text/html; charset=utf-8"
|
||||
|
||||
if respond_to?(:create_error_page)
|
||||
create_error_page()
|
||||
18
ruby-1.8.x_rubylibdir.patch
Normal file
18
ruby-1.8.x_rubylibdir.patch
Normal file
@ -0,0 +1,18 @@
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in.orig
|
||||
+++ configure.in
|
||||
@@ -1757,7 +1757,12 @@ case "$target_os" in
|
||||
rubyw_install_name="$RUBYW_INSTALL_NAME"
|
||||
;;
|
||||
esac
|
||||
-RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
|
||||
+
|
||||
+AC_ARG_WITH(rubylibdir,
|
||||
+ [ --with-rubylibdir=DIR stdlib libraries in DIR [[LIBDIR/ruby]]],
|
||||
+ [rubylibdir=$withval],
|
||||
+ [rubylibdir='${libdir}/ruby'])
|
||||
+RUBY_LIB_PREFIX=`eval echo \\"${rubylibdir}\\"`
|
||||
|
||||
AC_ARG_WITH(sitedir,
|
||||
[ --with-sitedir=DIR site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
|
||||
13
ruby.changes
13
ruby.changes
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 20 13:26:07 UTC 2011 - mrueckert@suse.de
|
||||
|
||||
- drop ruby-1.8.7.p299_webrick_error_page_encoding.patch:
|
||||
we will stick to the upstream charset
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 18 13:46:36 UTC 2011 - mrueckert@suse.de
|
||||
|
||||
- added ruby-1.8.x_rubylibdir.patch:
|
||||
allows us to also change the path for the stdlib part of the ruby
|
||||
directory tree
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 22 16:38:09 UTC 2011 - mrueckert@suse.de
|
||||
|
||||
|
||||
17
ruby.spec
17
ruby.spec
@ -17,10 +17,9 @@
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: ruby
|
||||
Version: 1.8.7.p334
|
||||
Release: 1
|
||||
Release: 0
|
||||
#
|
||||
%define pkg_version 1.8.7
|
||||
%define patch_level p334
|
||||
@ -70,8 +69,7 @@ Patch10: ruby-1.8.x_openssl_branch_update.patch
|
||||
Patch11: ruby-1.8.x_yaml2byte.patch
|
||||
Patch12: 1887f60a8540f64f5c7bb14d57c0be70506941b8.patch
|
||||
Patch13: ruby-1.8.7.p334_remove_zlib_test_params_test.patch
|
||||
# need to discuss with sec team which encoding is better
|
||||
Patch14: ruby-1.8.7.p299_webrick_error_page_encoding.patch
|
||||
Patch14: ruby-1.8.x_rubylibdir.patch
|
||||
# vendor ruby files taken from:
|
||||
# http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/
|
||||
Source3: site-specific.rb
|
||||
@ -84,7 +82,6 @@ Source6: ruby.macros
|
||||
%endif
|
||||
#
|
||||
Summary: An Interpreted Object-Oriented Scripting Language
|
||||
|
||||
%description
|
||||
Ruby is an interpreted scripting language for quick and easy
|
||||
object-oriented programming. It has many features for processing text
|
||||
@ -129,7 +126,6 @@ Requires: %{name} = %{version}
|
||||
Requires: ruby_with_bleak_house = %{bleak_house_version}
|
||||
Provides: ruby-devel_with_bleak_house = %{bleak_house_version}-%{release}
|
||||
%endif
|
||||
|
||||
%description devel
|
||||
Development files to link against Ruby.
|
||||
|
||||
@ -144,7 +140,6 @@ License: GPLv2+
|
||||
Group: Development/Languages/Ruby
|
||||
Summary: TCL/TK bindings for Ruby
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description tk
|
||||
TCL/TK bindings for Ruby
|
||||
|
||||
@ -162,7 +157,6 @@ Requires: %{name} = %{version}
|
||||
%if 0%{?suse_version} >= 1120
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
%description doc-ri
|
||||
This package contains the RI docs for ruby
|
||||
|
||||
@ -180,7 +174,6 @@ Requires: %{name} = %{version}
|
||||
%if 0%{?suse_version} >= 1120
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
%description doc-html
|
||||
This package contains the HTML docs for ruby
|
||||
|
||||
@ -195,7 +188,6 @@ License: GPLv2+
|
||||
Group: Development/Languages/Ruby
|
||||
Requires: %{name} = %{version}
|
||||
Summary: Example scripts for ruby
|
||||
|
||||
%description examples
|
||||
Example scripts for ruby
|
||||
|
||||
@ -210,7 +202,6 @@ License: GPLv2+
|
||||
Group: Development/Languages/Ruby
|
||||
Requires: %{name} = %{version}
|
||||
Summary: An Interpreted Object-Oriented Scripting Language
|
||||
|
||||
%description test-suite
|
||||
Ruby is an interpreted scripting language for quick and easy
|
||||
object-oriented programming. It has many features for processing text
|
||||
@ -259,6 +250,7 @@ Authors:
|
||||
%patch11
|
||||
%patch12
|
||||
%patch13
|
||||
%patch14
|
||||
%if 0%{?with_bleak_house}
|
||||
for patch in valgrind configure gc ; do
|
||||
patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch
|
||||
@ -268,8 +260,9 @@ find . -type f | xargs -n 1 sed -i "s@#!\s*/usr/local/bin/ruby@#!/usr/bin/ruby@"
|
||||
# make sure it _really_ rebuilds parse.c for us
|
||||
old parse.c
|
||||
|
||||
|
||||
%build
|
||||
# autoreconf -fi
|
||||
autoreconf -fi
|
||||
export CFLAGS="%{optflags} -g -fno-strict-aliasing"
|
||||
%configure \
|
||||
--target=%{_target_platform} \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user