rpms/erlang/devel import.log, NONE, 1.1 otp-0001-Do-not-format-man-pages.patch, NONE, 1.1 otp-0002-Remove-rpath.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 erlang.spec, 1.44, 1.45 sources, 1.15, 1.16 otp-install.patch, 1.2, NONE otp-null.patch, 1.1, NONE otp-rpath.patch, 1.4, NONE otp-sslrpath.patch, 1.4, NONE otp_src_R13B02_OTP-8199.patch, 1.1, NONE

Mon Mar 15 09:41:42 UTC 2010

Author: peter

Update of /cvs/pkgs/rpms/erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14057/devel

Modified Files:
	.cvsignore erlang.spec sources 
Added Files:
	import.log otp-0001-Do-not-format-man-pages.patch 
	otp-0002-Remove-rpath.patch 
Removed Files:
	otp-install.patch otp-null.patch otp-rpath.patch 
	otp-sslrpath.patch otp_src_R13B02_OTP-8199.patch 
Log Message:
Ver. R13B-04


--- NEW FILE import.log ---
erlang-R13B-04_1_fc12:HEAD:erlang-R13B-04.1.fc12.src.rpm:1268645923

otp-0001-Do-not-format-man-pages.patch:
 Install.src |   11 -----------
 1 file changed, 11 deletions(-)

--- NEW FILE otp-0001-Do-not-format-man-pages.patch ---
>From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 25 Feb 2010 16:45:28 +0300
Subject: [PATCH 1/2] Do not format man-pages

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 erts/etc/unix/Install.src |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index 83f9690..d26137d 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -139,14 +139,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
 cp -p $Name.boot start.boot
 cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script
 
-#
-# Fixing the man pages
-#
-
-if [ -d $ERL_ROOT/man ]
-then
-    cd $ERL_ROOT
-    ./misc/format_man_pages $ERL_ROOT
-fi
-
 exit 0
-- 
1.6.2.5


otp-0002-Remove-rpath.patch:
 crypto/c_src/Makefile.in |    2 +-
 crypto/priv/Makefile     |    2 +-
 ssl/c_src/Makefile.in    |    7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE otp-0002-Remove-rpath.patch ---
>From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 25 Feb 2010 16:57:43 +0300
Subject: [PATCH 2/2] Remove rpath

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 lib/crypto/c_src/Makefile.in |    2 +-
 lib/crypto/priv/Makefile     |    2 +-
 lib/ssl/c_src/Makefile.in    |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 18040a3..b169930 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -83,7 +83,7 @@ endif
 DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
 
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
 CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -lcrypto
 else
 SSL_DED_LD_RUNTIME_LIBRARY_PATH=
diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
index b8acdac..2c2989a 100644
--- a/lib/crypto/priv/Makefile
+++ b/lib/crypto/priv/Makefile
@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o
 # ----------------------------------------------------
 
 $(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)
diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
index 49a209f..5e6c74e 100644
--- a/lib/ssl/c_src/Makefile.in
+++ b/lib/ssl/c_src/Makefile.in
@@ -105,7 +105,7 @@ else
 SSL_MAKEFILE =
 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@;
@@ -117,7 +117,7 @@ else
 ifeq ($(findstring osf,$(TARGET)),osf)		# osf1: -Wl,-rpath,
 CC_R_FLAG = -Wl,-rpath,
 else						# Default: -Wl,-R
-CC_R_FLAG = -Wl,-R
+CC_R_FLAG =
 endif
 endif
 endif
@@ -125,7 +125,7 @@ endif
 ifeq ($(strip $(CC_R_FLAG)),)
 CC_R_OPT =
 else
-CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR)
+CC_R_OPT =
 endif
 
 SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@
-- 
1.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	2 Nov 2009 21:03:41 -0000	1.15
+++ .cvsignore	15 Mar 2010 09:41:41 -0000	1.16
@@ -1,3 +1,3 @@
-otp_doc_html_R13B02.tar.gz
-otp_doc_man_R13B02.tar.gz
-otp_src_R13B02.tar.gz
+otp_doc_html_R13B04.tar.gz
+otp_doc_man_R13B04.tar.gz
+otp_src_R13B04.tar.gz


Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- erlang.spec	2 Nov 2009 15:40:49 -0000	1.44
+++ erlang.spec	15 Mar 2010 09:41:41 -0000	1.45
@@ -1,5 +1,5 @@
 %define ver R13B
-%define rel 02
+%define rel 04
 
 Name:           erlang
 Version:        %{ver}
@@ -12,28 +12,27 @@ URL:            http://www.erlang.org
 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
+# TODO this patch needs rebase against current tree
 Patch0:         otp-links.patch
-Patch1:         otp-install.patch
-Patch2:         otp-rpath.patch
-# OTP-8199 In the new release of Reltool (0.5) there is a severe bug that may cause your source files to be deleted. 
-# http://www.erlang.org/download/patches/otp_src_R13B02_OTP-8199.readme
-Patch3:         http://www.erlang.org/download/patches/otp_src_R13B02_OTP-8199.patch
+Patch1:		otp-0001-Do-not-format-man-pages.patch
+Patch2:		otp-0002-Remove-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
 BuildRequires:  openssl-devel
+BuildRequires:	zlib-devel
 BuildRequires:  unixODBC-devel
 BuildRequires:  wxGTK-devel
 BuildRequires:	tcl-devel
 BuildRequires:	tk-devel
-BuildRequires:  gd-devel
 BuildRequires:	java-1.6.0-openjdk-devel
 BuildRequires:  flex
 BuildRequires:	m4
+BuildRequires:	fop
 
 Requires:       tk
 
-%description 
+%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
@@ -50,29 +49,18 @@ Documentation for Erlang.
 
 %prep
 %setup -q -n otp_src_%{ver}%{rel}
-%patch0 -p1 -b .links
-%patch1 -p1 -b .install
+%patch1 -p1 -b .do_not_format_manpages
 %patch2 -p1 -b .rpath
-%patch3 -p1 -b .OTP-8199
-
-# 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
-
+# remove shipped zlib sources
+rm -f erts/emulator/zlib/*.[ch]
 
 
 %build
 %ifarch sparcv9 sparc64
-CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib
 %else
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib
 %endif
-chmod -R u+w .
 make
 
 
@@ -105,14 +93,20 @@ done
 cd $RPM_BUILD_ROOT/%{_libdir}/erlang
 sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start}
 
+# remove unneeded *.erl sources
+find $RPM_BUILD_ROOT/%{_libdir}/erlang/lib -maxdepth 2 -type d -name *src -exec rm -rf {} \;
+
+# fixed permisson for wx library
+chmod 755 $RPM_BUILD_ROOT/%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files 
+%files
 %defattr(-,root,root)
-%doc AUTHORS EPLICENCE README
+%doc AUTHORS EPLICENCE README.md
 %{_bindir}/*
 %{_libdir}/erlang
 
@@ -127,6 +121,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Feb 13 2010 Peter Lemenkov <lemenkov at gmail.com> - R13B-04.1
+- New release R13B-04
+- Since now we're using %%configure instead of ./configure
+- Removed no longer needed fix for newer glibc version
+- Dropped %%patch3 (applied upstream)
+- Rebased patches
+- Added BR fop for rebuilding of docs
+- Use system-wide zlib instead of shipped one
+- Dropped BR gd-devel
+- Removed unneeded sources (should be fixed upstream)
+- Fixed permission for wx driver (should be fixed upstream)
+
 * Thu Oct 22 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - R13B-02-1
 - Update to R13B-02 (patched for what's released as 02-1 by upstream)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	2 Nov 2009 21:03:42 -0000	1.15
+++ sources	15 Mar 2010 09:41:42 -0000	1.16
@@ -1,3 +1,3 @@
-78fc0c139a0297e502a6008bd8166887  otp_doc_html_R13B02.tar.gz
-975b2c8a1cc2fda017cb5cd3864e32ba  otp_doc_man_R13B02.tar.gz
-d70bfba6935e52a7759168a35fbcabe7  otp_src_R13B02.tar.gz
+d69ce51bfabbdd0808461d86dfc95689  otp_doc_html_R13B04.tar.gz
+681aaef70affc64743f4e8c0675034af  otp_doc_man_R13B04.tar.gz
+ca6da4921e438891967900aa6a084341  otp_src_R13B04.tar.gz


--- otp-install.patch DELETED ---


--- otp-null.patch DELETED ---


--- otp-rpath.patch DELETED ---


--- otp-sslrpath.patch DELETED ---


--- otp_src_R13B02_OTP-8199.patch DELETED ---

