rpms/compat-erlang/devel compat-erlang.spec, NONE, 1.1 otp-glibc24.patch, NONE, 1.1 otp-install.patch, NONE, 1.1 otp-links.patch, NONE, 1.1 otp-rpath.patch, NONE, 1.1 otp-sslrpath.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Gérard Milmeister (gemi) fedora-extras-commits at redhat.com
Wed Jun 7 18:43:54 UTC 2006 

Author: gemi

Update of /cvs/extras/rpms/compat-erlang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21236/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compat-erlang.spec otp-glibc24.patch otp-install.patch 
	otp-links.patch otp-rpath.patch otp-sslrpath.patch 
Log Message:
auto-import compat-erlang-R10B-10.2 on branch devel from compat-erlang-R10B-10.2.src.rpm


--- NEW FILE compat-erlang.spec ---
Name:           compat-erlang
Version:        R10B
Release:        10.2%{?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_R10B-10.tar.gz
Patch:		otp-links.patch
Patch1:		otp-install.patch
Patch2:		otp-rpath.patch
Patch3:         otp-sslrpath.patch
Patch4:		otp-glibc24.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
BuildRequires:  openssl-devel
BuildRequires:  unixODBC-devel
BuildRequires:	tcl-devel
BuildRequires:	tk-devel
BuildRequires:	java-1.4.2-gcj-compat-devel
BuildRequires:  flex

Requires:	tk

%description 
Erlang is a general-purpose programming language and runtime
environment. Erlang has built-in support for concurrency, distribution
and fault tolerance. Erlang is used in several large telecommunication
systems from Ericsson.


%prep
%setup -q -n otp_src_R10B-10
%patch -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
sed -i -e 's|@libdir@/erlang|@libdir@/erlang-R10B|' Makefile.in


%build
./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
chmod -R u+w .
make


%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_PREFIX=$RPM_BUILD_ROOT install

%define erlangdir %{_libdir}/erlang-R10B

# clean up
find $RPM_BUILD_ROOT%{erlangdir} -perm 0775 | xargs chmod 755
find $RPM_BUILD_ROOT%{erlangdir} -name Makefile | xargs chmod 644
find $RPM_BUILD_ROOT%{erlangdir} -name \*.bat | xargs rm -f
find $RPM_BUILD_ROOT%{erlangdir} -name index.txt.old | xargs rm -f

# make links to binaries
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cd $RPM_BUILD_ROOT%{_bindir}
for file in erl erlc 
do
  ln -sf ../%{_lib}/erlang-R10B/bin/$file ${file}-R10B
done


%clean
rm -rf $RPM_BUILD_ROOT


%files 
%defattr(-,root,root)
%doc AUTHORS EPLICENCE README
%{_bindir}/*
%{_libdir}/erlang-R10B


%post
%{erlangdir}/Install -minimal %{erlangdir} >/dev/null 2>/dev/null


%changelog
* Wed Jun  7 2006 Gerard Milmeister <gemi at bluewin.ch> - R10B-10.2
- removed doc

* Tue Jun  6 2006 Gerard Milmeister <gemi at bluewin.ch> - R10B-10.1
- new package erlangR10B

* Mon Mar 13 2006 Gerard Milmeister <gemi at bluewin.ch> - R10B-10.1
- new version R10B-10

* Thu Dec 29 2005 Gerard Milmeister <gemi at bluewin.ch> - R10B-9.1
- New Version R10B-9

* Sat Oct 29 2005 Gerard Milmeister <gemi at bluewin.ch> - R10B-8.2
- updated rpath patch

* Sat Oct 29 2005 Gerard Milmeister <gemi at bluewin.ch> - R10B-8.1
- New Version R10B-8

* Sat Oct  1 2005 Gerard Milmeister <gemi at bluewin.ch> - R10B-6.4
- Added tk-devel and tcl-devel to buildreq
- Added tk to req

* Tue Sep  6 2005 Gerard Milmeister <gemi at bluewin.ch> - R10B-6.3
- Remove perl BuildRequires

* Tue Aug 30 2005 Gerard Milmeister <gemi at bluewin.ch> - R10B-6.2
- change /usr/lib to %%{_libdir}
- redirect output in %%post to /dev/null
- add unixODBC-devel to BuildRequires
- split doc off to erlang-doc package

* Sat Jun 25 2005 Gerard Milmeister <gemi at bluewin.ch> - R10B-6.1
- New Version R10B-6

* Sun Feb 13 2005 Gerard Milmeister <gemi at bluewin.ch> - R10B-3.1
- New Version R10B-3

* Mon Dec 27 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:R10B-2-0.fdr.1
- New Version R10B-2

* Wed Oct  6 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:R10B-0.fdr.1
- New Version R10B

* Thu Oct 16 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:R9B-1.fdr.1
- First Fedora release

otp-glibc24.patch:

--- NEW FILE otp-glibc24.patch ---
--- otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c.glibc24	2006-03-13 17:16:39.000000000 +0100
+++ otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c	2006-03-13 17:17:11.000000000 +0100
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include "hipe_signal.h"
 
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4
 /* See comment below for glibc 2.2. */
 #ifndef __USE_GNU
 #define __USE_GNU		/* to un-hide RTLD_NEXT */

otp-install.patch:

--- NEW FILE otp-install.patch ---
--- otp_src_R9C-0/erts/etc/unix/Install.src.install	2003-10-17 12:52:14.000000000 +0200
+++ otp_src_R9C-0/erts/etc/unix/Install.src	2003-10-17 14:26:49.000000000 +0200
@@ -84,7 +84,7 @@
   /bin/rm -f epmd
 fi
 
-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd
+ln -s ../erts-%I_VSN%/bin/epmd epmd
 
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl .
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl .
@@ -145,16 +145,4 @@
 	(ranlib $library) > /dev/null 2>&1
     done
 fi
-
-
-#
-# Fixing the man pages
-#
-
-if [ -d $ERL_ROOT/man ]
-then
-    cd $ERL_ROOT
-    ./misc/format_man_pages $ERL_ROOT
-fi
-
-
+exit 0

otp-links.patch:

--- NEW FILE otp-links.patch ---
--- otp_src_R9C-0/Makefile.in.links	2003-10-17 12:49:41.000000000 +0200
+++ otp_src_R9C-0/Makefile.in	2003-10-17 12:50:07.000000000 +0200
@@ -505,14 +505,6 @@
 # Erlang base public files
 #
 install.bin:
-	rm -f $(BINDIR)/erl $(BINDIR)/erlc \
-	      $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript
-	${LN_S} $(ERLANG_BINDIR)/erl      $(BINDIR)/erl
-	${LN_S} $(ERLANG_BINDIR)/erlc     $(BINDIR)/erlc
-	${LN_S} $(ERLANG_BINDIR)/ecc      $(BINDIR)/ecc
-	${LN_S} $(ERLANG_BINDIR)/elink    $(BINDIR)/elink
-	${LN_S} $(ERLANG_BINDIR)/ear      $(BINDIR)/ear
-	${LN_S} $(ERLANG_BINDIR)/escript  $(BINDIR)/escript
 
 #
 # Directories needed before we can install

otp-rpath.patch:

--- NEW FILE otp-rpath.patch ---
--- 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
 

otp-sslrpath.patch:

--- NEW FILE otp-sslrpath.patch ---
--- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath	2005-12-29 00:49:17.000000000 +0100
+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in	2005-12-29 00:50:15.000000000 +0100
@@ -95,7 +95,7 @@
 endif
 endif
 
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
+CC_R_FLAG=
 ifeq ($(findstring @,$(CC_R_FLAG)),@)
 # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
 # we try our best here instead...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-erlang/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jun 2006 18:36:17 -0000	1.1
+++ .cvsignore	7 Jun 2006 18:43:54 -0000	1.2
@@ -0,0 +1 @@
+otp_src_R10B-10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-erlang/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jun 2006 18:36:17 -0000	1.1
+++ sources	7 Jun 2006 18:43:54 -0000	1.2
@@ -0,0 +1 @@
+c1405c885f07d661b7362b822d571586  otp_src_R10B-10.tar.gz

More information about the scm-commits mailing list