Hello community, here is the log from the commit of package erlang for openSUSE:Factory checked in at 2013-04-14 16:12:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang (Old) and /work/SRC/openSUSE:Factory/.erlang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erlang", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2013-03-21 22:02:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2013-04-14 16:12:04.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 4 08:23:56 UTC 2013 - [email protected] + +- Drop rebar-specific RPM macros, these belong into erlang-rebar + (seperate package) + +------------------------------------------------------------------- +Sun Mar 31 07:28:23 UTC 2013 - [email protected] + +- Fix ppc and arm patches so that they don't conflict + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang.spec ++++++ --- /var/tmp/diff_new_pack.EH3bqD/_old 2013-04-14 16:12:11.000000000 +0200 +++ /var/tmp/diff_new_pack.EH3bqD/_new 2013-04-14 16:12:11.000000000 +0200 @@ -284,10 +284,7 @@ %setup -q -n otp_src_%{version} %patch0 -p1 -b .rpath %patch1 -p1 -%ifarch %arm %patch3 -p1 -autoreconf -si ./erts -%endif %patch4 -p1 chmod -R u+w . ++++++ erlang-ppc.patch ++++++ --- /var/tmp/diff_new_pack.EH3bqD/_old 2013-04-14 16:12:11.000000000 +0200 +++ /var/tmp/diff_new_pack.EH3bqD/_new 2013-04-14 16:12:11.000000000 +0200 @@ -1,12 +1,24 @@ -Index: otp_src_R14B04/erts/configure +Index: otp_src_R16B/erts/configure =================================================================== ---- otp_src_R14B04.orig/erts/configure -+++ otp_src_R14B04/erts/configure -@@ -5249,6 +5249,7 @@ case $chk_arch_ in +--- otp_src_R16B.orig/erts/configure ++++ otp_src_R16B/erts/configure +@@ -5404,6 +5404,7 @@ case $chk_arch_ in x86_64) ARCH=amd64;; amd64) ARCH=amd64;; macppc) ARCH=ppc;; -+ powerpc) ARCH=ppc;; ++ powerpc) ARCH=ppc;; + ppc) ARCH=ppc;; + ppc64) ARCH=ppc64;; + "Power Macintosh") ARCH=ppc;; +Index: otp_src_R16B/erts/configure.in +=================================================================== +--- otp_src_R16B.orig/erts/configure.in ++++ otp_src_R16B/erts/configure.in +@@ -617,6 +617,7 @@ case $chk_arch_ in + x86_64) ARCH=amd64;; + amd64) ARCH=amd64;; + macppc) ARCH=ppc;; ++ powerpc) ARCH=ppc;; ppc) ARCH=ppc;; ppc64) ARCH=ppc64;; "Power Macintosh") ARCH=ppc;; ++++++ fix-armv7hl.patch ++++++ --- /var/tmp/diff_new_pack.EH3bqD/_old 2013-04-14 16:12:11.000000000 +0200 +++ /var/tmp/diff_new_pack.EH3bqD/_new 2013-04-14 16:12:11.000000000 +0200 @@ -1,15 +1,24 @@ -diff --git a/erts/configure.in b/erts/configure.in -index 6ad1951..ce7e4ef 100644 ---- a/erts/configure.in -+++ b/erts/configure.in -@@ -620,6 +620,7 @@ case $chk_arch_ in +Index: otp_src_R16B/erts/configure +=================================================================== +--- otp_src_R16B.orig/erts/configure ++++ otp_src_R16B/erts/configure +@@ -5413,6 +5413,7 @@ case $chk_arch_ in armv5tel) ARCH=arm;; armv5tejl) ARCH=arm;; armv7l) ARCH=arm;; -+ armv7hl) ARCH=arm;; ++ armv7hl) ARCH=arm;; + tile) ARCH=tile;; + *) ARCH=noarch;; + esac +Index: otp_src_R16B/erts/configure.in +=================================================================== +--- otp_src_R16B.orig/erts/configure.in ++++ otp_src_R16B/erts/configure.in +@@ -626,6 +626,7 @@ case $chk_arch_ in + armv5tel) ARCH=arm;; + armv5tejl) ARCH=arm;; + armv7l) ARCH=arm;; ++ armv7hl) ARCH=arm;; tile) ARCH=tile;; *) ARCH=noarch;; esac --- -1.7.10 - ++++++ macros.erlang ++++++ --- /var/tmp/diff_new_pack.EH3bqD/_old 2013-04-14 16:12:11.000000000 +0200 +++ /var/tmp/diff_new_pack.EH3bqD/_new 2013-04-14 16:12:11.000000000 +0200 @@ -5,11 +5,6 @@ %erlang_dir %{_libdir}/erlang %erlang_libdir %{_libdir}/erlang/lib -%__rebar /usr/bin/rebar -%rebar_compile CFLAGS="${CFLAGS:-%optflags}" \ - CXXFLAGS="${CXXFLAGS:-%optflags}" \ - FFLAGS="${FFLAGS:-%optflags}" %{__rebar} compile -v - %__erl /usr/bin/erl %erlang_app_vsn() $(%{__erl} -noshell -eval '{ok,[{_,_,C}]}=file:consult("%{1}"), io:format(proplists:get_value(vsn,C)), halt().') %erlang_app_name() $(%{__erl} -noshell -eval '{ok,[{_,N,_}]}=file:consult("%{1}"), io:format(N), halt().') @@ -17,6 +12,3 @@ # fedora compat %_erldir %{erlang_dir} %_erllibdir %{erlang_libdir} - -%__rebar_compile %{rebar_compile} - -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
