pool/erlang
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 126576 from devel:languages:misc

Browse Source 
- Fix build with OpenDJK7, -target parameter no longer sets 
  -source so we have to do it manually. (forwarded request 126569 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/126576
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/erlang?expand=0&rev=4
This commit is contained in:
Stephan Kulow 2012-06-29 12:12:52 +00:00 committed by Git OBS Bridge
parent d46b655920
commit 4d0aa3b722
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erlang.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Jun 29 09:54:00 UTC 2012 - idonmez@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 - mvyskocil@suse.cz
- Simply use java-devel >= 1.6.0 as it expands to correct jdk on every
distribution
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 10 12:28:20 UTC 2011 - saschpe@suse.de Thu Nov 10 12:28:20 UTC 2011 - saschpe@suse.de

17
erlang.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package erlang # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,14 +16,13 @@
# #
Name: erlang Name: erlang
Version: R14B04 Version: R14B04
Release: 0 Release: 0
License: ErlPL-1.1
Summary: General-purpose programming language and runtime environment Summary: General-purpose programming language and runtime environment
Url: http://www.erlang.org License: ErlPL-1.1
Group: Development/Languages/Other Group: Development/Languages/Other
Url: http://www.erlang.org
Source: otp_src_%{version}.tar.gz Source: otp_src_%{version}.tar.gz
#Source: http://www.erlang.org/download/otp_src_%{version}.tar.gz #Source: http://www.erlang.org/download/otp_src_%{version}.tar.gz
Source1: otp_doc_html_%{version}.tar.gz Source1: otp_doc_html_%{version}.tar.gz
@ -45,12 +44,8 @@ BuildRequires: tcl-devel
BuildRequires: tk-devel BuildRequires: tk-devel
BuildRequires: unixODBC-devel BuildRequires: unixODBC-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build 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: Mesa-devel
BuildRequires: java-devel >= 1.6.0
BuildRequires: krb5-devel BuildRequires: krb5-devel
%if 0%{?sles_version} >= 10 %if 0%{?sles_version} >= 10
BuildRequires: update-alternatives BuildRequires: update-alternatives
@ -97,7 +92,7 @@ A DIscrepany AnaLYZer for ERlang programs.
%package doc %package doc
Summary: Erlang documentation Summary: Erlang documentation
Group: Development/Languages/Other Group: Development/Languages/Other
Recommends: %{name} = %{version} Requires: %{name} = %{version}
%description doc %description doc
Documentation for Erlang. Documentation for Erlang.
@ -205,7 +200,7 @@ sed -i 's|WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`|WX_LIBS="`$WX_CONFIG_WITH_ARGS -
# we need build only 1.5 target for java # we need build only 1.5 target for java
# for SLE only # for SLE only
%if 0%{?sles_version} >= 10 || 0%{?suse_version} >= 1110 %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 %endif
%if 0%{?suse_version} == 1100 || 0%{?fedora_version} == 9 %if 0%{?suse_version} == 1100 || 0%{?fedora_version} == 9
export CFLAGS="-fno-strict-aliasing" export CFLAGS="-fno-strict-aliasing"