diff options
| author | Peter Lemenkov <lemenkov@gmail.com> | 2010-11-18 15:38:45 +0300 |
|---|---|---|
| committer | Peter Lemenkov <lemenkov@gmail.com> | 2010-11-18 15:38:45 +0300 |
| commit | ab91326bd707b6c717b8628fe189947d600d8335 (patch) | |
| tree | 7d40b3a262ba56cbc62b6e6e581ce2586ddf1735 | |
| parent | f2b42e4a2107129ccf86c465e8cf2fc69af7c60d (diff) | |
| download | erlang-ab91326bd707b6c717b8628fe189947d600d8335.tar.gz erlang-ab91326bd707b6c717b8628fe189947d600d8335.tar.xz erlang-ab91326bd707b6c717b8628fe189947d600d8335.zip | |
Fixed build on EL-6
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
| -rw-r--r-- | erlang.spec | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/erlang.spec b/erlang.spec index e934a64..c55ece6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -8,17 +8,17 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel}.4%{?dist} +Release: %{upstream_rel}.5%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: ERPL URL: http://www.erlang.org Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}.tar.gz -%if 0%{?el4}%{?el5} +#%if 0%{?el5}%{?el6} Source1: http://erlang.org/download/otp_doc_html_R14B.tar.gz Source2: http://erlang.org/download/otp_doc_man_R14B.tar.gz -%endif +#%endif # Fedora-specific Patch1: otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch # Fedora-specific @@ -49,7 +49,7 @@ BuildRequires: zlib-devel BuildRequires: flex BuildRequires: m4 %if %{with doc} -%if 0%{?el6}%{?fedora} +%if 0%{?fedora} BuildRequires: fop BuildRequires: libxslt # Required for building docs (escript) @@ -492,15 +492,15 @@ Summary: A library for accessing Java from Erlang Group: Development/Languages Requires: %{name}-erts = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 -%if 0%{?el4}%{?el5} -%if 0%{?el5} +%if 0%{?el5}%{?el6} %ifarch %{ix86} x86_64 BuildRequires: java-1.6.0-openjdk-devel %else +%if 0%{?el5} BuildRequires: java-1.4.2-gcj-compat-devel -%endif %else -BuildRequires: java-1.4.2-gcj-compat-devel +BuildRequires: java-1.5.0-gcj-devel +%endif %endif %else BuildRequires: java-1.6.0-openjdk-devel @@ -995,7 +995,7 @@ popd make %if %{with doc} -%if 0%{?el6}%{?fedora} +%if 0%{?fedora} make docs %endif %endif @@ -1034,7 +1034,7 @@ install -m 0644 xemacs-erlang/*.elc "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlan make DESTDIR=$RPM_BUILD_ROOT install %if %{with doc} -%if 0%{?el5} +%if 0%{?el5}%{?el6} # extract prebuilt docs and man-pages tar xf %{SOURCE1} -C $RPM_BUILD_ROOT%{_libdir}/erlang tar xf %{SOURCE2} -C $RPM_BUILD_ROOT%{_libdir}/erlang @@ -2215,6 +2215,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 18 2010 Peter Lemenkov <lemenkov@gmail.com> - R14B-0.5 +- Fixed building on EL-6 + * Mon Nov 15 2010 Peter Lemenkov <lemenkov@gmail.com> - R14B-0.4 - No more dependent on erlang-rpm-macros sub-package |