diff --git a/erlang.spec b/erlang.spec index fb7c46d..9d3719b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -24,7 +24,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.1%{?dist}.1 +Release: %{upstream_rel_for_rpm}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -940,8 +940,9 @@ Erlang mode for XEmacs (source lisp files). %patch8 -p1 -b .fix_armv7hl_hipe # end of autogenerated prep patch list +# FIXME we should come up with a better solution # remove shipped zlib sources -rm -f erts/emulator/zlib/*.[ch] +#rm -f erts/emulator/zlib/*.[ch] # Fix 664 file mode chmod 644 lib/kernel/examples/uds_dist/c_src/Makefile @@ -953,6 +954,9 @@ chmod 644 lib/ssl/examples/src/Makefile rm -f lib/ssl/examples/certs/etc/otpCA/index.txt.old rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old +# Reconfigure everything to apply changes to the autotools templates +./otp_build autoconf + %build %ifarch sparcv9 sparc64 @@ -2264,6 +2268,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 24 2013 Peter Lemenkov - R16B-02.2 +- Fix building for armv7hl (patch taken from OpenSUSE repository) + * Thu Sep 26 2013 Peter Lemenkov - R16B-02.1 - Ver. R16B02 (see rhbz #1009502) - Increase erlang(erl_drv_version) from 2.1 to 2.2 (drivers needs rebuilding)