Hello community, here is the log from the commit of package ghc-hruby for openSUSE:Factory checked in at 2017-07-23 12:15:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-hruby (Old) and /work/SRC/openSUSE:Factory/.ghc-hruby.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-hruby" Sun Jul 23 12:15:41 2017 rev:2 rq:511931 version:0.3.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-hruby/ghc-hruby.changes 2017-04-12 18:07:00.744043073 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-hruby.new/ghc-hruby.changes 2017-07-23 12:15:51.235421078 +0200 @@ -1,0 +2,6 @@ +Tue Jul 18 08:10:02 UTC 2017 - [email protected] + +- Apply "add-ruby-2.4-support.patch" from upstream to add support + for Ruby version 2.4.x (the new default version in Factory). + +------------------------------------------------------------------- New: ---- add-ruby-2.4-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-hruby.spec ++++++ --- /var/tmp/diff_new_pack.cNMlmk/_old 2017-07-23 12:15:52.639222784 +0200 +++ /var/tmp/diff_new_pack.cNMlmk/_new 2017-07-23 12:15:52.639222784 +0200 @@ -26,6 +26,7 @@ Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Patch1: https://github.com/bartavelle/hruby/commit/ab6e3492ad1db9aa1236e2b61738cd63a69996ce.patch#/add-ruby-2.4-support.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel @@ -36,7 +37,7 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel -BuildRequires: ruby2.2-devel +BuildRequires: ruby2.4-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-QuickCheck-devel @@ -51,7 +52,7 @@ Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} -Requires: ruby2.2-devel +Requires: ruby2.4-devel Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} @@ -60,6 +61,7 @@ %prep %setup -q -n %{pkg_name}-%{version} +%patch1 -p1 %build %ghc_lib_build ++++++ add-ruby-2.4-support.patch ++++++ >From ab6e3492ad1db9aa1236e2b61738cd63a69996ce Mon Sep 17 00:00:00 2001 From: bartavelle <[email protected]> Date: Fri, 21 Jul 2017 08:01:36 +0200 Subject: [PATCH] Tentative auto detection of ruby2.4 --- Setup.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Setup.hs b/Setup.hs index fcbb77b..eda96cf 100644 --- a/Setup.hs +++ b/Setup.hs @@ -32,7 +32,7 @@ evalRuby :: String -- expression to evaluate evalRuby exp = do let getruby [] = return (ExitFailure 3, "beuh", undefined) getruby (x:xs) = readProcessWithExitCode x ["-e", exp] "" `catch` \ (_ :: IOException) -> getruby xs - (exitCode, out, err) <- getruby [ "ruby2.1", "ruby2.0", "ruby2", "ruby1.8", "ruby"] + (exitCode, out, err) <- getruby [ "ruby.ruby2.4", "ruby2.4", "ruby2.1", "ruby2.0", "ruby2", "ruby1.8", "ruby"] return $ if exitCode == ExitSuccess then Just out else Nothing
