vondruch pushed to ruby (private-ruby-2.3). "Upgrade to Ruby 2.3.0 (r50092)."
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Mar 27 09:01:09 UTC 2015
>From 6fbf02c6ff6645938dc9a21d7ce8b07df96cce07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Thu, 26 Mar 2015 17:23:37 +0100
Subject: Upgrade to Ruby 2.3.0 (r50092).
diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
index 005edc3..c00d559 100644
--- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
@@ -11,65 +11,108 @@ Subject: [PATCH] Prevent duplicated paths when empty version string is
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/configure.in b/configure.in
-index 17ed3ed..5843651 100644
+index db37cd6..5f39a70 100644
--- a/configure.in
+++ b/configure.in
-@@ -4004,8 +4004,6 @@ AS_CASE(["$target_os"],
+@@ -4004,9 +4004,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
])
-rubylibdir='${rubylibprefix}/${ruby_version}'
-rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
-
+-
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
AC_ARG_WITH(rubyarchprefix,
-@@ -4035,6 +4033,7 @@ AC_ARG_WITH(ruby-version,
- [ruby_version=full])
+ AS_HELP_STRING([--with-rubyarchprefix=DIR],
+@@ -4031,56 +4028,62 @@ AC_SUBST(RI_BASE_NAME)
+
+ AC_ARG_WITH(ruby-version,
+ AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
+- [ruby_version=$withval],
+- [ruby_version=full])
++ [ruby_version_dir_name=$withval],
++ [ruby_version_dir_name=full])
unset RUBY_LIB_VERSION
unset RUBY_LIB_VERSION_STYLE
-+ruby_version_suffix=/'${ruby_version}'
- AS_CASE(["$ruby_version"],
- [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'],
- [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */'])
-@@ -4051,30 +4050,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
- ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
- eval $ruby_version
- elif test -z "${ruby_version}"; then
+-AS_CASE(["$ruby_version"],
+- [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'],
+- [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */'])
+-if test ${RUBY_LIB_VERSION_STYLE+set}; then
+- {
+- echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
+- echo '#define STRINGIZE(x) x'
+- test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
+- echo '#include "verconf.h"'
+- echo '#include "version.h"'
+- echo 'ruby_version=RUBY_LIB_VERSION'
+- } > conftest.c
+- test -f verconf.h || > verconf.h
+- ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
+- eval $ruby_version
+-elif test -z "${ruby_version}"; then
- AC_MSG_ERROR([No ruby version, No place for bundled libraries])
-+ unset ruby_version_suffix
-+ AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
- else
- RUBY_LIB_VERSION="${ruby_version}"
- fi
+-else
+- RUBY_LIB_VERSION="${ruby_version}"
+-fi
++AS_CASE(["$ruby_version_dir_name"],
++ [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */'],
++ [RUBY_LIB_VERSION_STYLE='3 /* full */'])
++{
++echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
++echo '#define STRINGIZE(x) x'
++test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
++echo '#include "verconf.h"'
++echo '#include "version.h"'
++echo 'ruby_version=RUBY_LIB_VERSION'
++} > conftest.c
++test -f verconf.h || > verconf.h
++ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
++eval $ruby_version
++
++RUBY_LIB_VERSION="${ruby_version}"
++
AC_SUBST(RUBY_LIB_VERSION_STYLE)
AC_SUBST(RUBY_LIB_VERSION)
-+rubylibdir='${rubylibprefix}'${ruby_version_suffix}
-+rubyarchdir=${multiarch+'${rubyarchprefix}'${ruby_version_suffix}}${multiarch-'${rubylibdir}/${arch}'}
++ruby_version_dir=/'${ruby_version_dir_name}'
++if test -z "${ruby_version_dir_name}"; then
++ unset ruby_version_dir
++ AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
++fi
++
++rubylibdir='${rubylibprefix}'${ruby_version_dir}
++rubyarchdir=${multiarch+'${rubyarchprefix}'${ruby_version_dir}}${multiarch-'${rubylibdir}/${arch}'}
+
AC_ARG_WITH(sitedir,
AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
[sitedir=$withval],
[sitedir='${rubylibprefix}/site_ruby'])
-sitelibdir='${sitedir}/${ruby_version}'
-+sitelibdir='${sitedir}'${ruby_version_suffix}
++sitelibdir='${sitedir}'${ruby_version_dir}
AC_ARG_WITH(sitearchdir,
AS_HELP_STRING([--with-sitearchdir=DIR],
[architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
[sitearchdir=$withval],
- [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
-+ [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby'${ruby_version_suffix}}${multiarch-'${sitelibdir}/${sitearch}'}])
++ [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby'${ruby_version_dir}}${multiarch-'${sitelibdir}/${sitearch}'}])
AC_ARG_WITH(vendordir,
AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
[vendordir=$withval],
[vendordir='${rubylibprefix}/vendor_ruby'])
-vendorlibdir='${vendordir}/${ruby_version}'
-+vendorlibdir='${vendordir}'${ruby_version_suffix}
++vendorlibdir='${vendordir}'${ruby_version_dir}
AC_ARG_WITH(vendorarchdir,
AS_HELP_STRING([--with-vendorarchdir=DIR],
+ [architecture dependent vendor libraries in DIR [[VENDORDIR/SITEARCH]], "no" to disable vendor directory]),
+ [vendorarchdir=$withval],
+- [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
++ [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
+
+ if test "${LOAD_RELATIVE+set}"; then
+ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
diff --git a/loadpath.c b/loadpath.c
index 9160031..0d4d953 100644
--- a/loadpath.c
diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch
index 501045d..5ecad7d 100644
--- a/ruby-2.1.0-custom-rubygems-location.patch
+++ b/ruby-2.1.0-custom-rubygems-location.patch
@@ -17,7 +17,7 @@ index 03a4152..0e371e2 100644
+++ b/configure.in
@@ -4090,6 +4090,10 @@ AC_ARG_WITH(vendorarchdir,
[vendorarchdir=$withval],
- [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
+ [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
+AC_ARG_WITH(rubygemsdir,
+ AS_HELP_STRING([--with-rubygemsdir=DIR], [custom rubygems directory]),
diff --git a/ruby.spec b/ruby.spec
index 93d79e9..36073d6 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -10,7 +10,7 @@
#%%global milestone rc1
# Keep the revision enabled for pre-releases from SVN.
-%global revision 50089
+%global revision 50092
%global ruby_archive %{name}-%{ruby_version}
@@ -494,7 +494,8 @@ mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
cp %{SOURCE1} %{buildroot}%{rubygems_dir}/rubygems/defaults
# Move gems root into common direcotry, out of Ruby directory structure.
-mv %{buildroot}%{ruby_libdir}/gems %{buildroot}%{gem_dir}
+mv %{buildroot}%{ruby_libdir}/gems/%{ruby_version} %{buildroot}%{gem_dir}
+rm -r %{buildroot}%{ruby_libdir}/gems
# Create folders for gem binary extensions.
# TODO: These folders should go into rubygem-filesystem but how to achieve it,
@@ -879,8 +880,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
-* Tue Feb 03 2015 Vít Ondruch <vondruch at redhat.com> - 2.3.0-0.5.r50089
-- Upgrade to Ruby 2.3.0 (r50089).
+* Thu Mar 26 2015 Vít Ondruch <vondruch at redhat.com> - 2.3.0-0.5.r50092
+- Upgrade to Ruby 2.3.0 (r50092).
- Initialize all load paths in operating_system.rb.
- Fix directory ownership.
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/ruby.git/commit/?h=private-ruby-2.3&id=6fbf02c6ff6645938dc9a21d7ce8b07df96cce07
More information about the scm-commits
mailing list