commit b1ef53b0181393d5fcc65d4d449e5339e13a01c0
Author: Lubomir Rintel <[email protected]>
Date: Mon Apr 28 12:32:53 2014 +0200
Fix build
erlang-meck-0001-Build-with-R16B03.patch | 32 ++++++++++++++++++++++++++++++
erlang-meck.spec | 8 ++++++-
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/erlang-meck-0001-Build-with-R16B03.patch
b/erlang-meck-0001-Build-with-R16B03.patch
new file mode 100644
index 0000000..d4a674b
--- /dev/null
+++ b/erlang-meck-0001-Build-with-R16B03.patch
@@ -0,0 +1,32 @@
+From a151f644aeba90423c95e2a110233acceb078191 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <[email protected]>
+Date: Mon, 28 Apr 2014 12:30:12 +0200
+Subject: [PATCH] Build with R16B03
+
+Based on the following upstream commit:
+
+commit 3e8de7e17d8cbaff59d78d4cb628812e10719243
+Author: Adam Lindberg <[email protected]>
+Date: Fri Mar 14 18:42:00 2014 +0100
+
+ Fix changed cover compile opts on R16B03+
+---
+ test/meck_tests.erl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/meck_tests.erl b/test/meck_tests.erl
+index 3cc22c9..44d6a29 100644
+--- a/test/meck_tests.erl
++++ b/test/meck_tests.erl
+@@ -625,7 +625,7 @@ cover_options_fail_({_OldPath, Src, Module}) ->
+ {ok, _} = compile:file(Src, CompilerOptions),
+ ?assertEqual(CompilerOptions, meck_mod:compile_options(Module)),
+ {ok, _} = cover:compile_beam(Module),
+- ?assertEqual([], meck_mod:compile_options(Module)),
++ ?assertEqual([{i,"../test/include"},{d,'TEST',true}],
meck_mod:compile_options(Module)),
+ a = Module:a(),
+ b = Module:b(),
+ {1, 2} = Module:c(1, 2),
+--
+1.9.0
+
diff --git a/erlang-meck.spec b/erlang-meck.spec
index 8960c7c..047ae32 100644
--- a/erlang-meck.spec
+++ b/erlang-meck.spec
@@ -8,7 +8,7 @@
Name: erlang-%{realname}
Version: 0.7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A mocking library for Erlang
Group: Development/Libraries
License: ASL 2.0
@@ -17,6 +17,8 @@ URL: http://eproxus.github.com/meck/
Source0:
%{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
# Backported from upstream - https://github.com/eproxus/meck/pull/95
Patch1: erlang-meck-0001-Remove-parametrized-module-test.patch
+# Based on upstream commiterlang-meck-0001-Build-with-R16B03.patch
+Patch2: erlang-meck-0001-Build-with-R16B03.patch
BuildRequires: erlang-rebar
Requires: erlang-compiler%{?_isa}
Requires: erlang-erts%{?_isa}
@@ -37,6 +39,7 @@ modules, such as making sure no function is called in a way
it should not.
%prep
%setup -q -n %{upstream}-%{realname}-37715e6
%patch1 -p1 -b .no_param_mods
+%patch2 -p1 -b .r16b03
%build
@@ -62,6 +65,9 @@ rebar eunit -v
%changelog
+* Mon Apr 28 2014 Lubomir Rintel (GoodData) <[email protected]> -
0.7.2-5
+- Fix build
+
* Sat Aug 03 2013 Fedora Release Engineering <[email protected]>
- 0.7.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
_______________________________________________
erlang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/erlang
