[erlang-snappy] Fixed FTBFS in Rawhide (F19)

Peter Lemenkov peter at fedoraproject.org
Sun Mar 3 17:31:31 UTC 2013


commit 95871f73931c239fb84a6a5d83c2df72cf801568
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Mar 3 21:31:22 2013 +0400

    Fixed FTBFS in Rawhide (F19)
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 erlang-snappy-0001-No-bundled-snappy.patch         |    4 +-
 ...ficial-dependency-on-the-Erlang-s-version.patch |   23 ++++++++++++++++++++
 erlang-snappy.spec                                 |   11 +++++++-
 3 files changed, 34 insertions(+), 4 deletions(-)
---
diff --git a/erlang-snappy-0001-No-bundled-snappy.patch b/erlang-snappy-0001-No-bundled-snappy.patch
index 33152df..2084920 100644
--- a/erlang-snappy-0001-No-bundled-snappy.patch
+++ b/erlang-snappy-0001-No-bundled-snappy.patch
@@ -1,7 +1,7 @@
 From 2a9b93202575a35e79a89fec0036156d3f9ccb29 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Mon, 24 Sep 2012 18:08:17 +0400
-Subject: [PATCH 1/1] No bundled snappy
+Subject: [PATCH 1/2] No bundled snappy
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -40,5 +40,5 @@ index ad92b23..ddee851 100644
 +{port_specs, [{"priv/snappy_nif.so", ["c_src/*.cc"]}]}.
  {eunit_opts, [verbose]}.
 -- 
-1.7.12
+1.8.1.4
 
diff --git a/erlang-snappy-0002-Remove-artificial-dependency-on-the-Erlang-s-version.patch b/erlang-snappy-0002-Remove-artificial-dependency-on-the-Erlang-s-version.patch
new file mode 100644
index 0000000..552efdd
--- /dev/null
+++ b/erlang-snappy-0002-Remove-artificial-dependency-on-the-Erlang-s-version.patch
@@ -0,0 +1,23 @@
+From 6e610ddb2ae0c2c3f62e4728be15a8f75e5e1fe2 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 3 Mar 2013 20:27:29 +0400
+Subject: [PATCH 2/2] Remove artificial dependency on the Erlang's version
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ rebar.config | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/rebar.config b/rebar.config
+index ddee851..fb48520 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -1,5 +1,3 @@
+-{require_otp_vsn, "R13B04|R14|R15"}.
+-
+ {erl_opts, [debug_info, warn_unused_vars, warn_shadow_vars, warn_unused_import]}.
+ {port_env, [
+     {"(linux|solaris)", "LDFLAGS", "$LDFLAGS -lstdc++ -lsnappy"}
+-- 
+1.8.1.4
+
diff --git a/erlang-snappy.spec b/erlang-snappy.spec
index fa20371..fa9fdb7 100644
--- a/erlang-snappy.spec
+++ b/erlang-snappy.spec
@@ -6,11 +6,12 @@
 %filter_provides_in %{_libdir}/erlang/lib/.*\.so$
 %filter_setup
 }
-
+%{expand: %(NIF_VER=`rpm -q erlang-erts --provides | grep --color=no erl_nif_version` ; if [ "$NIF_VER" != "" ]; then echo %%global __erlang_nif_version $NIF_VER ; fi)}
+%{expand: %(DRV_VER=`rpm -q erlang-erts --provides | grep --color=no erl_drv_version` ; if [ "$DRV_VER" != "" ]; then echo %%global __erlang_drv_version $DRV_VER ; fi)}
 
 Name:		erlang-%{realname}
 Version:	1.0.3
-Release:	0.3.git80db168%{?dist}
+Release:	0.4.git80db168%{?dist}
 Summary:	An Erlang NIF wrapper for Google's snappy library
 Group:		Development/Languages
 License:	ASL 2.0
@@ -18,12 +19,14 @@ URL:		https://github.com/fdmanana/snappy-erlang-nif
 # wget --content-disposition https://github.com/fdmanana/snappy-erlang-nif/tarball/80db168
 Source0:	%{upstream}-%{realname}-erlang-nif-%{git_tag}.tar.gz
 Patch1:		erlang-snappy-0001-No-bundled-snappy.patch
+Patch2:		erlang-snappy-0002-Remove-artificial-dependency-on-the-Erlang-s-version.patch
 BuildRequires:	erlang-rebar
 BuildRequires:	snappy-devel
 # Error:erlang(erlang:load_nif/2) in R12B or earlier
 Requires:	erlang-erts%{?_isa} >= R13B
 Requires:	erlang-kernel%{?_isa}
 Requires:	erlang-stdlib%{?_isa}
+%{?__erlang_nif_version:Requires: %{__erlang_nif_version}}
 
 
 %description
@@ -33,6 +36,7 @@ An Erlang NIF wrapper for Google's snappy compressor/decompressor.
 %prep
 %setup -q -n %{upstream}-%{realname}-erlang-nif-%{git_tag}
 %patch1 -p1 -b .no_bundled_snappy
+%patch2 -p1 -b .r16
 rm -rf c_src/snappy
 
 
@@ -62,6 +66,9 @@ rebar eunit -v
 
 
 %changelog
+* Sun Mar 03 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.0.3-0.4.git80db168
+- Fixed FTBFS in Rawhide (F19)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-0.3.git80db168
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list