[erlang-eleveldb] Use new erlang macros to build with $RPM_OPT/LD_FLAGS etc, verbosely
Ville Skyttä
scop at fedoraproject.org
Sat Jul 12 12:19:30 UTC 2014
commit 0e5e0cba10be3db4294c24643ad8a1c0e58ca2be
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Sat Jul 12 15:19:45 2014 +0300
Use new erlang macros to build with $RPM_OPT/LD_FLAGS etc, verbosely
- Disable cache leak test on F-20, F-21, and F-22 (#1107767, #1106223)
erlang-eleveldb.spec | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/erlang-eleveldb.spec b/erlang-eleveldb.spec
index eae87a1..23de73c 100644
--- a/erlang-eleveldb.spec
+++ b/erlang-eleveldb.spec
@@ -12,7 +12,7 @@
Name: erlang-%{realname}
Version: 1.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Erlang LevelDB API
Group: Development/Languages
License: ASL 2.0
@@ -28,6 +28,7 @@ Patch3: erlang-eleveldb-0003-fix-build-on-s390.patch
# Fedora/EPEL-specific
Patch4: erlang-eleveldb-0004-TEMPORARILY-skip-verify_compactions-option.patch
BuildRequires: erlang-rebar
+BuildRequires: erlang-rpm-macros >= 0.1.4
BuildRequires: leveldb-devel
BuildRequires: snappy-devel
# Error:erlang(erlang:load_nif/2) in R12B and older
@@ -51,14 +52,14 @@ rm -f c_src/snappy-1.0.4.tar.gz
%patch2 -p1 -b .remove_perf_counters
%patch3 -p1 -b .s390
%patch4 -p1 -b .fedora
-%if 0%{?fc17}%{?fc18}
+%if 0%{?fc17}%{?fc18}%{?fc20}%{?fc21}%{?fc22}
# Another one FIXME
rm -rf test/cacheleak.erl
%endif
%build
-rebar compile -v
+%rebar_compile
%install
@@ -70,7 +71,7 @@ install -p -m 0755 priv/%{realname}.so %{buildroot}%{_libdir}/erlang/lib/%{realn
%check
-rebar eunit -v
+%__rebar eunit -v
%files
@@ -86,6 +87,10 @@ rebar eunit -v
%changelog
+* Sat Jul 12 2014 Ville Skyttä <ville.skytta at iki.fi> - 1.3.2-4
+- Use new erlang macros to build with $RPM_OPT/LD_FLAGS etc, verbosely
+- Disable cache leak test on F-20, F-21, and F-22 (#1107767, #1106223)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list