Upgrade to Ruby 2.7.0 (d9f8b88b47).
This commit is contained in:
parent
0f9a6af433
commit
e1f59277c4
8 changed files with 13 additions and 13 deletions
|
|
@ -26,7 +26,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 028ef7ca3e..cdeff87871 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3820,6 +3820,13 @@ AC_SUBST(rubyarchhdrdir)dnl
|
||||
@@ -3824,6 +3824,13 @@ AC_SUBST(rubyarchhdrdir)dnl
|
||||
AC_SUBST(sitearchhdrdir)dnl
|
||||
AC_SUBST(vendorarchhdrdir)dnl
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 11fc237552..b77e88fc37 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3037,6 +3037,11 @@ AS_IF([test ${multiarch+set}], [
|
||||
@@ -3041,6 +3041,11 @@ AS_IF([test ${multiarch+set}], [
|
||||
])
|
||||
|
||||
archlibdir='${libdir}/${arch}'
|
||||
|
|
@ -24,5 +24,5 @@ index 11fc237552..b77e88fc37 100644
|
|||
archincludedir='${includedir}/${arch}'
|
||||
sitearchincludedir='${includedir}/${sitearch}'
|
||||
--
|
||||
1.8.3.1
|
||||
2.22.0
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 999e2d6d5d..11fc237552 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3675,7 +3675,8 @@ AS_CASE(["$ruby_version_dir_name"],
|
||||
@@ -3679,7 +3679,8 @@ AS_CASE(["$ruby_version_dir_name"],
|
||||
ruby_version_dir=/'${ruby_version_dir_name}'
|
||||
|
||||
if test -z "${ruby_version_dir_name}"; then
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index b77e88fc37..6bba453e3c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3739,6 +3739,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||
@@ -3743,6 +3743,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||
AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
|
||||
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 6bba453e3c..028ef7ca3e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3711,6 +3711,10 @@ AC_ARG_WITH(vendorarchdir,
|
||||
@@ -3715,6 +3715,10 @@ AC_ARG_WITH(vendorarchdir,
|
||||
[vendorarchdir=$withval],
|
||||
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ index 6bba453e3c..028ef7ca3e 100644
|
|||
AS_IF([test "${LOAD_RELATIVE+set}"], [
|
||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||
RUBY_EXEC_PREFIX=''
|
||||
@@ -3735,6 +3739,7 @@ AC_SUBST(sitearchdir)dnl
|
||||
@@ -3739,6 +3743,7 @@ AC_SUBST(sitearchdir)dnl
|
||||
AC_SUBST(vendordir)dnl
|
||||
AC_SUBST(vendorlibdir)dnl
|
||||
AC_SUBST(vendorarchdir)dnl
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk
|
|||
index 168dc52..20c218a 100644
|
||||
--- a/common.mk
|
||||
+++ b/common.mk
|
||||
@@ -1059,9 +1059,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE)
|
||||
@@ -1058,9 +1058,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE)
|
||||
$(srcdir)/template/prelude.c.tmpl
|
||||
|
||||
$(PRELUDE_C): $(COMPILE_PRELUDE) \
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 8ea969412f..a00f2b6776 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3626,9 +3626,6 @@ AS_CASE(["$target_os"],
|
||||
@@ -3630,9 +3630,6 @@ AS_CASE(["$target_os"],
|
||||
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
|
||||
])
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ index 8ea969412f..a00f2b6776 100644
|
|||
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
|
||||
AC_ARG_WITH(rubyarchprefix,
|
||||
AS_HELP_STRING([--with-rubyarchprefix=DIR],
|
||||
@@ -3651,56 +3648,62 @@ AC_ARG_WITH(ridir,
|
||||
@@ -3655,56 +3652,62 @@ AC_ARG_WITH(ridir,
|
||||
AC_SUBST(ridir)
|
||||
AC_SUBST(RI_BASE_NAME)
|
||||
|
||||
|
|
@ -120,7 +120,7 @@ index 8ea969412f..a00f2b6776 100644
|
|||
|
||||
AS_IF([test "${LOAD_RELATIVE+set}"], [
|
||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||
@@ -3717,6 +3720,7 @@ AC_SUBST(sitearchincludedir)dnl
|
||||
@@ -3721,6 +3724,7 @@ AC_SUBST(sitearchincludedir)dnl
|
||||
AC_SUBST(arch)dnl
|
||||
AC_SUBST(sitearch)dnl
|
||||
AC_SUBST(ruby_version)dnl
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#%%global milestone rc2
|
||||
|
||||
# Keep the revision enabled for pre-releases from SVN.
|
||||
%global revision e44c9b1147
|
||||
%global revision d9f8b88b47
|
||||
|
||||
%global ruby_archive %{name}-%{ruby_version}
|
||||
|
||||
|
|
@ -1202,7 +1202,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
|
|||
|
||||
%changelog
|
||||
* Mon Jul 01 2019 Vít Ondruch <vondruch@redhat.com> - 2.7.0-1
|
||||
- Upgrade to Ruby 2.7.0 (e44c9b1147).
|
||||
- Upgrade to Ruby 2.7.0 (d9f8b88b47).
|
||||
|
||||
* Tue Jun 25 2019 Vít Ondruch <vondruch@redhat.com> - 2.6.3-121
|
||||
- Properly support %%prerelease in %%gemspec_ macros.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue