From 02ad4e305ad6bc317841cfbda7fa787ec788d618 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Aug 10 2008 21:03:45 +0000 Subject: Ver. R12B-3 --- diff --git a/.cvsignore b/.cvsignore index eb1a5f9..40fd7e4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_doc_html_R12B-1.tar.gz -otp_doc_man_R12B-1.tar.gz -otp_src_R12B-1.tar.gz +otp_doc_html_R12B-3.tar.gz +otp_doc_man_R12B-3.tar.gz +otp_src_R12B-3.tar.gz diff --git a/erlang.spec b/erlang.spec index 4b65ec7..89df4d7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,20 +1,21 @@ +%define ver R12B +%define rel 3 + Name: erlang -Version: R12B -Release: 1.0%{?dist} +Version: %{ver} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: Erlang Public License +License: ERPL URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz +Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch -Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch5: otp-run_erl.patch -Patch6: otp-ssl_missing_libs.patch +Patch6: otp-ssl_missing_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -22,6 +23,7 @@ BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: gd-devel BuildRequires: java-1.4.2-gcj-compat-devel BuildRequires: flex BuildRequires: m4 @@ -44,17 +46,25 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-1 +%setup -q -n otp_src_%{ver}-%{rel} %patch0 -p1 -b .links %patch1 -p1 -b .install -%patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath -%patch5 -p0 -b .run_erl %patch6 -p0 -b .keyutils +# enable dynamic linking for ssl +sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure +sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile +# fix for newer glibc version +sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c +# use gcc -shared instead of ld +sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in +sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in + + %build -./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -66,6 +76,7 @@ make INSTALL_PREFIX=$RPM_BUILD_ROOT install # clean up find $RPM_BUILD_ROOT%{_libdir}/erlang -perm 0775 | xargs chmod 755 find $RPM_BUILD_ROOT%{_libdir}/erlang -name Makefile | xargs chmod 644 +find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.o | xargs chmod 644 find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.bat | xargs rm -f find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f @@ -108,8 +119,38 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Mar 26 2008 Peter Lemenkov - R12B-1.0 -- Ver. R12B-1 +* Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 +- fix license tag + +* Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 +- new release R12B-3 + +* Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 +- new release R12B-1 + +* Sat Feb 23 2008 Gerard Milmeister - R12B-0.3 +- disable strict aliasing optimization + +* Mon Feb 18 2008 Fedora Release Engineering - R12B-0.2 +- Autorebuild for GCC 4.3 + +* Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 +- new release R12B-0 + +* Wed Dec 05 2007 Release Engineering - R11B-6 + - Rebuild for deps + +* Sun Aug 19 2007 Gerard Milmeister - R11B-5.3 +- fix some permissions + +* Sat Aug 18 2007 Gerard Milmeister - R11B-5.2 +- enable dynamic linking for ssl + +* Sat Aug 18 2007 Gerard Milmeister - R11B-5.1 +- new release R11B-5 + +* Sat Mar 24 2007 Thomas Fitzsimmons - R11B-2.4 +- Require java-1.5.0-gcj-devel for build. * Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 - remove buildroot from installed files diff --git a/import.log b/import.log new file mode 100644 index 0000000..d674608 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +erlang-R12B-3_2_fc9:EL-4:erlang-R12B-3.2.fc9.src.rpm:1218402209 diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 9e82e62..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- otp_src_R10B-8/lib/crypto/c_src/Makefile.in.rpath 2005-10-29 22:50:59.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/c_src/Makefile.in 2005-10-29 22:51:23.000000000 +0200 -@@ -79,7 +79,7 @@ - ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else ---- otp_src_R10B-8/lib/crypto/priv/Makefile.rpath 2005-10-29 22:52:01.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/priv/Makefile 2005-10-29 22:52:32.000000000 +0200 -@@ -60,7 +60,7 @@ - # ---------------------------------------------------- - - $(SO_DRIVER): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_DRIVER): $(OBJS) ---- otp_src_R10B-8/lib/ssl/c_src/Makefile.in.rpath 2005-10-29 22:53:15.000000000 +0200 -+++ otp_src_R10B-8/lib/ssl/c_src/Makefile.in 2005-10-29 22:53:50.000000000 +0200 -@@ -104,9 +104,9 @@ - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - diff --git a/otp-run_erl.patch b/otp-run_erl.patch deleted file mode 100644 index dc2b262..0000000 --- a/otp-run_erl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- erts/etc/common/Makefile.in.orig 2008-03-27 13:11:52.000000000 +0300 -+++ erts/etc/common/Makefile.in 2008-03-27 13:13:23.000000000 +0300 -@@ -298,7 +298,7 @@ - $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) - - $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o -- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) -+ $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) -lutil - - $(OBJDIR)/run_erl.o: ../unix/run_erl.c - $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c diff --git a/sources b/sources index 8775a1f..c7aff56 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz -96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz -6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz +8865d406c256abbff63eaff62d2216aa otp_doc_html_R12B-3.tar.gz +13098954c9d5804bb8394fe7badb3d0d otp_doc_man_R12B-3.tar.gz +c2e7f0ad54b8fadebde2d94106608d97 otp_src_R12B-3.tar.gz