diff --git a/erlang.spec b/erlang.spec index c49ea4a..8c15b57 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,18 +1,19 @@ Name: erlang Version: R11B -Release: 0.1.1%{?dist} +Release: 2.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Source: http://www.erlang.org/download/otp_src_R11B-2.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-2.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-2.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch4: otp-glibc25.patch Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +24,7 @@ BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: java-1.4.2-gcj-compat-devel BuildRequires: flex -BuildRequires: m4 +BuildRequires: m4 Requires: tk @@ -43,11 +44,12 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R11B-0 +%setup -q -n otp_src_R11B-2 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath +%patch4 -p1 -b .glibc25 %patch5 -p1 -b .run_erl @@ -80,6 +82,10 @@ do ln -sf ../%{_lib}/erlang/bin/$file . done +# remove buildroot from installed files +cd $RPM_BUILD_ROOT/%{_libdir}/erlang +sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} + %clean rm -rf $RPM_BUILD_ROOT @@ -102,13 +108,33 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 +- remove buildroot from installed files + +* Sat Dec 30 2006 Gerard Milmeister - R11B-2.2 +- added patch for compiling with glibc 2.5 + +* Sat Dec 30 2006 Gerard Milmeister - R11B-2.1 +- new version R11B-2 + +* Mon Aug 28 2006 Gerard Milmeister - R11B-0.3 +- Rebuild for FE6 -* Sun Oct 7 2007 Peter Lemenkov - R11B-0.1.1 -- Added missing BR for EL-4 - m4 +* Wed Jul 5 2006 Gerard Milmeister - R11B-0.2 +- add BR m4 * Thu May 18 2006 Gerard Milmeister - R11B-0.1 - new version R11B-0 +* Wed May 3 2006 Gerard Milmeister - R10B-10.3 +- added patch for run_erl by Knut-HÃ¥vard Aksnes + +* Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 +- new version R10B-10 + +* Thu Dec 29 2005 Gerard Milmeister - R10B-9.1 +- New Version R10B-9 + * Sat Oct 29 2005 Gerard Milmeister - R10B-8.2 - updated rpath patch diff --git a/otp-glibc25.patch b/otp-glibc25.patch new file mode 100644 index 0000000..b9d849d --- /dev/null +++ b/otp-glibc25.patch @@ -0,0 +1,11 @@ +--- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 ++++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 +@@ -34,7 +34,7 @@ + #endif + #include "hipe_signal.h" + +-#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) ++#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) + /* See comment below for glibc 2.2. */ + #ifndef __USE_GNU + #define __USE_GNU /* to un-hide RTLD_NEXT */ diff --git a/sources b/sources index 713b3df..c88cf68 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz -8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz -172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz +7d7cca1d2f392a8a317cb4c0bd904726 otp_src_R11B-2.tar.gz +e2c45ced77ec63b9b1dd95c8f5396f7d otp_doc_html_R11B-2.tar.gz +c81023f591c1bace836de3aa874f3c2a otp_doc_man_R11B-2.tar.gz