From c5dd4a82e95733c5c20a999d19b7002fd7bada09 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Jan 04 2017 15:41:02 +0000 Subject: Import upstream patch to support OTP 19 (BZ#1404851). --- diff --git a/erlang-erlydtl-0003-rebar.config-add-19-to-require_otp_version-regexp.patch b/erlang-erlydtl-0003-rebar.config-add-19-to-require_otp_version-regexp.patch new file mode 100644 index 0000000..6f49b7a --- /dev/null +++ b/erlang-erlydtl-0003-rebar.config-add-19-to-require_otp_version-regexp.patch @@ -0,0 +1,23 @@ +From 067a109902ea792841b5e8d10e525e7d57e4b161 Mon Sep 17 00:00:00 2001 +From: Andreas Stenius +Date: Tue, 21 Jun 2016 17:05:11 -0700 +Subject: [PATCH] rebar.config: add 19 to require_otp_version regexp + +fixes #242 +--- + rebar.config | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rebar.config b/rebar.config +index a7f88e1..3ac7c11 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -2,7 +2,7 @@ + + %% accept R15B02.., any R16B except R16B03 + %% also accept OTP v17, altough it may not work properly on that release yet.. +-{require_otp_vsn, "R15B0[^1]|R16B$|R16B[^0]|R16B0[^3]|R16B03-1|17|18"}. ++{require_otp_vsn, "R15B0[^1]|R16B$|R16B[^0]|R16B0[^3]|R16B03-1|17|18|19"}. + + {erl_opts, [debug_info]}. + {yrl_opts, [{includefile, "include/erlydtl_preparser.hrl"}]}. diff --git a/erlang-erlydtl.spec b/erlang-erlydtl.spec index 41deaf1..6c49b49 100644 --- a/erlang-erlydtl.spec +++ b/erlang-erlydtl.spec @@ -11,7 +11,7 @@ Name: erlang-%{realname} Version: 0.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Erlang implementation of the Django Template Language Group: Development/Libraries License: MIT @@ -22,6 +22,9 @@ VCS: scm:git:https://github.com/%{upstream}/%{realname}.git Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}-%{version}.tar.gz Patch1: erlang-erlydtl-0001-Verbose-testing.patch Patch2: erlang-erlydtl-0002-Use-phash2-1-explicitly.-It-s-not-in-compat-layer.patch +# Import upstream patch to support OTP 19 +# https://github.com/erlydtl/erlydtl/issues/242 +Patch3: erlang-erlydtl-0003-rebar.config-add-19-to-require_otp_version-regexp.patch Provides: ErlyDTL = %{version}-%{release} BuildRequires: erlang-rebar @@ -37,6 +40,7 @@ returns a fully rendered document. %setup -q -n %{realname}-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -59,6 +63,9 @@ cp -arv priv %{buildroot}/%{erlang_appdir}/ %changelog +* Wed Dec 14 2016 Merlin Mathesius - 0.11.1-2 +- Import upstream patch to support OTP 19 (BZ#1404851). + * Thu May 12 2016 Peter Lemenkov - 0.11.1-1 - Ver. 0.11.1