Hello community, here is the log from the commit of package erlang for openSUSE:Factory checked in at 2012-06-29 14:12:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang (Old) and /work/SRC/openSUSE:Factory/.erlang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erlang", Maintainer is "cth...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2011-11-14 11:50:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2012-06-29 14:12:54.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 29 09:54:00 UTC 2012 - idon...@suse.com + +- Fix build with OpenDJK7, -target parameter no longer sets + -source so we have to do it manually. + +------------------------------------------------------------------- +Tue Jun 26 13:46:36 UTC 2012 - mvysko...@suse.cz + +- Simply use java-devel >= 1.6.0 as it expands to correct jdk on every + distribution + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang.spec ++++++ --- /var/tmp/diff_new_pack.64sNZr/_old 2012-06-29 14:12:58.000000000 +0200 +++ /var/tmp/diff_new_pack.64sNZr/_new 2012-06-29 14:12:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package erlang # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,13 @@ # - Name: erlang Version: R14B04 Release: 0 -License: ErlPL-1.1 Summary: General-purpose programming language and runtime environment -Url: http://www.erlang.org +License: ErlPL-1.1 Group: Development/Languages/Other +Url: http://www.erlang.org Source: otp_src_%{version}.tar.gz #Source: http://www.erlang.org/download/otp_src_%{version}.tar.gz Source1: otp_doc_html_%{version}.tar.gz @@ -45,12 +44,8 @@ BuildRequires: tk-devel BuildRequires: unixODBC-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1140 -BuildRequires: java-1_6_0-openjdk-devel -%else -BuildRequires: java-devel >= 1.5.0 -%endif BuildRequires: Mesa-devel +BuildRequires: java-devel >= 1.6.0 BuildRequires: krb5-devel %if 0%{?sles_version} >= 10 BuildRequires: update-alternatives @@ -97,7 +92,7 @@ %package doc Summary: Erlang documentation Group: Development/Languages/Other -Recommends: %{name} = %{version} +Requires: %{name} = %{version} %description doc Documentation for Erlang. @@ -205,7 +200,7 @@ # we need build only 1.5 target for java # for SLE only %if 0%{?sles_version} >= 10 || 0%{?suse_version} >= 1110 - export JAVAC="javac -target 1.5" + export JAVAC="javac -source 1.5 -target 1.5" %endif %if 0%{?suse_version} == 1100 || 0%{?fedora_version} == 9 export CFLAGS="-fno-strict-aliasing" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
