From 3fe333e7619d2ef717430617cbcc73f03d3bfbe3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 04:48:43 +0000 Subject: Initialize branch F-12 for erlang --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 -- cgit From 7d81667a62b362b757d03536129bfa0c444d7113 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:08 +0000 Subject: Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50462ff..ef337d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := erlang SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) -- cgit From 754cbdf6d6c1a1a26b0143b9de046f97443a80f7 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 9 Dec 2009 06:25:52 +0000 Subject: - rebuild with fixed GCC, fixes couchdb crash (#527370) --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 16271e3..a95ac3c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 09 2009 Kevin Kofler - R13B-01.3 +- rebuild with fixed GCC, fixes couchdb crash (#527370) + * Tue Aug 25 2009 Tomas Mraz - R13B-01.2 - rebuilt with new openssl -- cgit From 4de816847263280723a9099b72762a37663bb480 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 17 Mar 2010 14:56:46 +0000 Subject: Ver. R13B-04 --- .cvsignore | 6 +-- erlang.spec | 60 ++++++++++++++++------------ import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 32 +++++++++++++++ otp-0002-Remove-rpath.patch | 72 ++++++++++++++++++++++++++++++++++ otp-install.patch | 29 -------------- otp-null.patch | 11 ------ otp-rpath.patch | 48 ----------------------- otp-sslrpath.patch | 24 ------------ sources | 6 +-- 10 files changed, 146 insertions(+), 143 deletions(-) create mode 100644 import.log create mode 100644 otp-0001-Do-not-format-man-pages.patch create mode 100644 otp-0002-Remove-rpath.patch delete mode 100644 otp-install.patch delete mode 100644 otp-null.patch delete mode 100644 otp-rpath.patch delete mode 100644 otp-sslrpath.patch diff --git a/.cvsignore b/.cvsignore index 5704058..697a4fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R13B01.tar.gz -otp_doc_html_R13B01.tar.gz -otp_doc_man_R13B01.tar.gz +otp_doc_html_R13B04.tar.gz +otp_doc_man_R13B04.tar.gz +otp_src_R13B04.tar.gz diff --git a/erlang.spec b/erlang.spec index a95ac3c..3ad8efd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,9 +1,9 @@ %define ver R13B -%define rel 01 +%define rel 04 Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,25 +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 +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 @@ -47,28 +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 - -# 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 @@ -101,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 @@ -123,8 +121,20 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Dec 09 2009 Kevin Kofler - R13B-01.3 -- rebuild with fixed GCC, fixes couchdb crash (#527370) +* Sat Feb 13 2010 Peter Lemenkov - 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) - R13B-02-1 +- Update to R13B-02 (patched for what's released as 02-1 by upstream) * Tue Aug 25 2009 Tomas Mraz - R13B-01.2 - rebuilt with new openssl diff --git a/import.log b/import.log new file mode 100644 index 0000000..e0372c1 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch new file mode 100644 index 0000000..61e089e --- /dev/null +++ b/otp-0001-Do-not-format-man-pages.patch @@ -0,0 +1,32 @@ +From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 25 Feb 2010 16:45:28 +0300 +Subject: [PATCH 1/2] Do not format man-pages + +Signed-off-by: Peter Lemenkov +--- + 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 + diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch new file mode 100644 index 0000000..ffc6cde --- /dev/null +++ b/otp-0002-Remove-rpath.patch @@ -0,0 +1,72 @@ +From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 25 Feb 2010 16:57:43 +0300 +Subject: [PATCH 2/2] Remove rpath + +Signed-off-by: Peter Lemenkov +--- + 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 + diff --git a/otp-install.patch b/otp-install.patch deleted file mode 100644 index 68066c7..0000000 --- a/otp-install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 diff --git a/otp-null.patch b/otp-null.patch deleted file mode 100644 index 7dcaec7..0000000 --- a/otp-null.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c ---- otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null 2008-02-23 13:46:52.000000000 +0100 -+++ otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c 2008-02-23 13:47:15.000000000 +0100 -@@ -17,6 +17,7 @@ - * $Id$ - * - */ -+#include - #include "inet.h" - - #ifdef HAVE_CONFIG_H diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 5b1d459..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in 2009-04-21 18:51:34.000000000 +0530 -@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else -diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile ---- otp_src_R12B-5.orig/lib/crypto/priv/Makefile 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/priv/Makefile 2009-04-21 18:52:56.000000000 +0530 -@@ -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 -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in 2009-04-21 18:38:47.000000000 +0530 -+++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in 2009-04-21 19:58:29.000000000 +0530 -@@ -104,7 +104,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@; - # we try our best here instead... -@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - 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 - endif diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch deleted file mode 100644 index d53909a..0000000 --- a/otp-sslrpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 -+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 -@@ -102,7 +102,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@; - # we try our best here instead... -@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - 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 - endif diff --git a/sources b/sources index 4958992..9207cc0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b3db581de6c13e1ec93d74e54a7b4231 otp_src_R13B01.tar.gz -42cb55bbfa5dc071fd56034615072f7a otp_doc_html_R13B01.tar.gz -fa8f96159bd9a88aa2fb9e4d79d7affe otp_doc_man_R13B01.tar.gz +d69ce51bfabbdd0808461d86dfc95689 otp_doc_html_R13B04.tar.gz +681aaef70affc64743f4e8c0675034af otp_doc_man_R13B04.tar.gz +ca6da4921e438891967900aa6a084341 otp_src_R13B04.tar.gz -- cgit From 408136c5875533acd5ca1edbf99f66183e1a0552 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 26 Mar 2010 13:15:37 +0000 Subject: Do not remove src dirs completely - keep *.hrl --- erlang.spec | 34 ++++++++++++++++++++++++---------- import.log | 1 + 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3ad8efd..b53835d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.1%{?dist} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -78,26 +78,34 @@ find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f # doc mkdir -p erlang_doc tar -C erlang_doc -zxf %{SOURCE1} -tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} -gzip $RPM_BUILD_ROOT/%{_libdir}/erlang/man/man*/* +tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} +gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* # make links to binaries -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -cd $RPM_BUILD_ROOT/%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_bindir} +cd $RPM_BUILD_ROOT%{_bindir} for file in erl erlc escript dialyzer do ln -sf ../%{_lib}/erlang/bin/$file . done # remove buildroot from installed files -cd $RPM_BUILD_ROOT/%{_libdir}/erlang +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 {} \; +# remove unneeded sources, but keep *.hrl and *.yrl +for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -maxdepth 1 -type f ! -name "*.[yh]rl" -print -delete || true ; done +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -maxdepth 2 -type d -name src -empty -delete -# fixed permisson for wx library -chmod 755 $RPM_BUILD_ROOT/%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so +# fix permissions for asn1 library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so + +# fix permissions for megaco library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv.so +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv_mt.so + +# fix permissons for wx library +chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so %clean @@ -121,6 +129,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 26 2010 Peter Lemenkov - R13B-04.2 +- Do not remove all files from %%{_libdir}/erlang/lib/*/src - keep + *.[yh]rl intact +- Fix permissions for megaco *.so objects +- Fix permissions for asn1 *.so objects + * Sat Feb 13 2010 Peter Lemenkov - R13B-04.1 - New release R13B-04 - Since now we're using %%configure instead of ./configure diff --git a/import.log b/import.log index e0372c1..9a70af5 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 +erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 -- cgit From 328521c9ee3b05b154cd5bf5ef76506e7f284d58 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 14 Apr 2010 10:03:40 +0000 Subject: Added rpm macros and more cleanups --- erlang-find-provides.escript | 24 +++++++++++ erlang-find-provides.sh | 97 ++++++++++++++++++++++++++++++++++++++++++++ erlang-find-requires.escript | 19 +++++++++ erlang-find-requires.sh | 23 +++++++++++ erlang.spec | 56 +++++++++++++++++++++++-- import.log | 1 + macros.erlang | 13 ++++++ 7 files changed, 230 insertions(+), 3 deletions(-) create mode 100755 erlang-find-provides.escript create mode 100755 erlang-find-provides.sh create mode 100755 erlang-find-requires.escript create mode 100755 erlang-find-requires.sh create mode 100644 macros.erlang diff --git a/erlang-find-provides.escript b/erlang-find-provides.escript new file mode 100755 index 0000000..4433337 --- /dev/null +++ b/erlang-find-provides.escript @@ -0,0 +1,24 @@ +#!/usr/bin/escript +%% -*- erlang -*- + +main(EbinFiles) -> + lists:foreach( + fun(BeamFile) -> + try + {ok, {Module, [{exports,Exports}]}} = beam_lib:chunks(BeamFile, [exports]), + case Module of + eunit_test -> io:format ("erlang(eunit_test:nonexisting_function/0)~n"); + wx -> io:format ("erlang(demo:start/0)~n"); + _ -> ok + end, + lists:foreach( fun({ModFun,Arity})->io:format("erlang(~p:~s/~p)~n", [Module, ModFun,Arity]) end, Exports) + catch + _:_ -> + ok + end + end, + EbinFiles); + +main(_) -> + halt(1). + diff --git a/erlang-find-provides.sh b/erlang-find-provides.sh new file mode 100755 index 0000000..0592130 --- /dev/null +++ b/erlang-find-provides.sh @@ -0,0 +1,97 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant provides +# information that needs to be included in the package. + +BUILDDIR= + +while true; do + case "$1" in + -b) BUILDDIR="$2"; shift 2;; + --) shift; break;; + *) echo "$0: option error at $1"; exit 1;; + esac +done + +filelist=`sed "s/['\"]/\\\&/g"` + +/usr/lib/rpm/rpmdeps --provides $filelist + +# Get the list of *.app files +appfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.app$') + +for f in $appfiles; do + app=`cat $f | tr -d [:space:] | awk -F '{application,' '{print $2}'|cut -d , -f 1` + ver=`cat $f | tr -d [:space:] | grep -o -E '\{vsn,\".*[0-9]\"\}' | sed -e "s,.vsn\,\",,g;s,\".,,g"` + + # HiPE module is different from others + if [ "$app" == "hipe" ] ; + then + # Hardcoded minimal set of HiPE exported functions + echo "erlang(hipe_amd64_main:rtl_to_amd64/3)" + echo "erlang(hipe_arm_main:rtl_to_arm/3)" + echo "erlang(hipe:c/1)" + echo "erlang(hipe:compile/4)" + echo "erlang(hipe_data_pp:pp/4)" + echo "erlang(hipe_icode2rtl:translate/2)" + echo "erlang(hipe_icode_heap_test:cfg/1)" + echo "erlang(hipe_ppc_main:rtl_to_ppc/3)" + echo "erlang(hipe_rtl_arch:endianess/0)" + echo "erlang(hipe_rtl_arch:nr_of_return_regs/0)" + echo "erlang(hipe_rtl_arch:word_size/0)" + echo "erlang(hipe_rtl_cfg:init/1)" + echo "erlang(hipe_rtl_cfg:linearize/1)" + echo "erlang(hipe_rtl_cfg:pp/1)" + echo "erlang(hipe_rtl_cfg:remove_trivial_bbs/1)" + echo "erlang(hipe_rtl_cfg:remove_unreachable_code/1)" + echo "erlang(hipe_rtl_cleanup_const:cleanup/1)" + echo "erlang(hipe_rtl_lcm:rtl_lcm/2)" + echo "erlang(hipe_rtl_ssa_avail_expr:cfg/1)" + echo "erlang(hipe_rtl_ssa:check/1)" + echo "erlang(hipe_rtl_ssa_const_prop:propagate/1)" + echo "erlang(hipe_rtl_ssa:convert/1)" + echo "erlang(hipe_rtl_ssapre:rtl_ssapre/2)" + echo "erlang(hipe_rtl_ssa:remove_dead_code/1)" + echo "erlang(hipe_rtl_ssa:unconvert/1)" + echo "erlang(hipe_rtl_symbolic:expand/1)" + echo "erlang(hipe_sparc_main:rtl_to_sparc/3)" + echo "erlang(hipe_tagscheme:fixnum_val/1)" + echo "erlang(hipe_tagscheme:is_fixnum/1)" + echo "erlang(hipe_x86_main:rtl_to_x86/3)" + fi + + echo "erlang($app) = $ver" +done + +# Check for very special case - erts, by guessing by directory name +basedirs=$(echo $filelist | tr [:blank:] '\n' | grep -o -E 'erlang\/lib\/[a-zA-Z_0-9]*-[0-9.]*\/ebin' | cut -d \/ -f 3 | sort | uniq) +for bd in $basedirs; do + basename=`echo $bd | cut -d \- -f 1` + basever=`echo $bd | cut -d \- -f 2` + case $basename in + "erts") + echo "erlang($basename) = $basever" + + # BIFs from erts - this module is very specific + cat $BUILDDIR/erts/emulator/*/erl_bif_list.h 2>/dev/null |\ + grep -v am__AtomAlias |\ + grep -o -E 'am_.*\,am_.*\,.\,' |\ + sed s,am_,,g |\ + sed -e "s,Plus,+,g;s,Minus,-,g;s,Neqeq,=\/=,g;s,Neq,\/=,g;s,Div,\/,g;s,Eqeq,=\:=,g;s,Eq,==,g;s,Ge,>=,g;s,Gt,>,g;s,Le,=<,g;s,Lt,<,g;s,Times,*,g;s,subtract,--,g;s,append\,,++\,,g" |\ + awk -F \, '{print "erlang(" $1 ":" $2 "/" $3 ")" }' + + # Add BIFs for HiPE + grep "bif " $BUILDDIR/erts/emulator/hipe/*.tab | awk -F "bif " '{print "erlang(" $2 ")"}' + ;; + "wx") + echo "erlang($basename) = $basever" + ;; + *) + ;; + esac +done + +# Get the list of *.beam files +beamfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.beam$') +/usr/lib/rpm/erlang-find-provides.escript $beamfiles | sed s,\',,g + diff --git a/erlang-find-requires.escript b/erlang-find-requires.escript new file mode 100755 index 0000000..1a16f76 --- /dev/null +++ b/erlang-find-requires.escript @@ -0,0 +1,19 @@ +#!/usr/bin/escript +%% -*- erlang -*- + +main(EbinFiles) -> + lists:foreach( + fun(BeamFile) -> + try + {ok, {_Module, [{imports,Imports}]}} = beam_lib:chunks(BeamFile, [imports]), + lists:foreach( fun({ModName,ModFun,Arity})->io:format("erlang(~s:~s/~p)~n", [ModName,ModFun,Arity]) end, Imports) + catch + _:_ -> + ok + end + end, + EbinFiles); + +main(_) -> + halt(1). + diff --git a/erlang-find-requires.sh b/erlang-find-requires.sh new file mode 100755 index 0000000..de6a87f --- /dev/null +++ b/erlang-find-requires.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant requires +# information that needs to be included in the package. + +filelist=`sed "s/['\"]/\\\&/g"` + +/usr/lib/rpm/rpmdeps --requires $filelist + +# Get the list of *.app files +appfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.app$') + +for f in $appfiles; do + apps=`cat $f | tr -d [:space:] | grep -o -E '\{applications,\[.*[a-zA-Z0-9_]\]\}' | sed -e "s,.*\[,,g;s,\].*,,g;s.,. .g"` + for a in $apps; do + echo "erlang($a)" + done +done + +# Get the list of *.beam files +beamfiles=$(echo $filelist | tr [:blank:] '\n' | grep -o -E '.*/ebin/.*\.beam$') +/usr/lib/rpm/erlang-find-requires.escript $beamfiles | sort | uniq + diff --git a/erlang.spec b/erlang.spec index b53835d..d157cfb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,6 +12,11 @@ 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 +Source3: erlang-find-provides.escript +Source4: erlang-find-provides.sh +Source5: erlang-find-requires.escript +Source6: erlang-find-requires.sh +Source7: macros.erlang # TODO this patch needs rebase against current tree Patch0: otp-links.patch Patch1: otp-0001-Do-not-format-man-pages.patch @@ -75,9 +80,11 @@ 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 -# doc +# install additional doc files mkdir -p erlang_doc tar -C erlang_doc -zxf %{SOURCE1} + +# install man-pages tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* @@ -94,9 +101,33 @@ cd $RPM_BUILD_ROOT%{_libdir}/erlang sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} # remove unneeded sources, but keep *.hrl and *.yrl -for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -maxdepth 1 -type f ! -name "*.[yh]rl" -print -delete || true ; done +for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -maxdepth 1 -type f ! -name "*.hrl" -print -delete || true ; done +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/{cerl,flow,icode,main,misc,util}/*.erl +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/orber-*/COSS/CosNaming/*.erl +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/snmp-*/src/{agent,app,compiler,manager,misc}/*.erl +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/src/gen/*.erl find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -maxdepth 2 -type d -name src -empty -delete +# remove C and Java sources +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/erl_interface-*/src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/c_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/java_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/java_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/c_src +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src + +# remove empty or intermediate files and directories +rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc +rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosEvent-*/info +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosEventDomain-*/info +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/crypto-*/priv/obj +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk +rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc + # fix permissions for asn1 library chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so @@ -107,6 +138,13 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_sca # fix permissons for wx library chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so +# Install RPM related files +install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.escript +install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.sh +install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.escript +install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.sh +install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang + %clean rm -rf $RPM_BUILD_ROOT @@ -118,6 +156,13 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_libdir}/erlang +# RPM stuff +%{_sysconfdir}/rpm/macros.erlang +%{_libdir}/rpm/erlang-find-provides.escript +%{_libdir}/rpm/erlang-find-provides.sh +%{_libdir}/rpm/erlang-find-requires.escript +%{_libdir}/rpm/erlang-find-requires.sh + %files doc %defattr(-,root,root) @@ -129,6 +174,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 26 2010 Peter Lemenkov - R13B-04.3 +- Added rpm-related stuff for auto-generating erlang dependencies in the future builds +- Since now *.yrl files are removed too. +- Removed unnecessary C and Java sources + * Fri Mar 26 2010 Peter Lemenkov - R13B-04.2 - Do not remove all files from %%{_libdir}/erlang/lib/*/src - keep *.[yh]rl intact diff --git a/import.log b/import.log index 9a70af5..5537ce7 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 +erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 diff --git a/macros.erlang b/macros.erlang new file mode 100644 index 0000000..88542e0 --- /dev/null +++ b/macros.erlang @@ -0,0 +1,13 @@ +# handy macros for erlang-related packages + +%_erldir %{_libdir}/erlang +%_erllibdir %{_erldir}/lib + +%__erlang_provides %{_rpmconfigdir}/erlang-find-provides.sh -b %{_builddir}/%{buildsubdir} -- +%__erlang_requires %{_rpmconfigdir}/erlang-find-requires.sh + +%__erlang_provides_requires \ +%global _use_internal_dependency_generator 0\ +%global __find_provides %__erlang_provides\ +%global __find_requires %__erlang_requires\ +%{nil} -- cgit From d45236d9a842be3c0aad4130bdd58a11f38611cd Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 17 Apr 2010 17:05:52 +0000 Subject: Fix few minor outstanding issues before splitting into pieces --- erlang.spec | 33 ++++++++---- import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 4 +- otp-0002-Remove-rpath.patch | 4 +- otp-0006-Fix-shared-libraries-installation.patch | 58 ++++++++++++++++++++++ otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch | 35 +++++++++++++ ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++++++++++++++++++++ 7 files changed, 175 insertions(+), 15 deletions(-) create mode 100644 otp-0006-Fix-shared-libraries-installation.patch create mode 100644 otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0008-Fix-check-for-compile-workspace-overflow.patch diff --git a/erlang.spec b/erlang.spec index d157cfb..eb436fa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.3%{?dist} +Release: %{rel}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -19,8 +19,16 @@ Source6: erlang-find-requires.sh Source7: macros.erlang # TODO this patch needs rebase against current tree Patch0: otp-links.patch +# Fedora-specific Patch1: otp-0001-Do-not-format-man-pages.patch +# Fedora-specific Patch2: otp-0002-Remove-rpath.patch +# Upstreamed +Patch6: otp-0006-Fix-shared-libraries-installation.patch +# Fedora-specific +Patch7: otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +# Upstreamed +Patch8: otp-0008-Fix-check-for-compile-workspace-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -36,6 +44,9 @@ BuildRequires: m4 BuildRequires: fop Requires: tk +Requires: mesa-libGL +Requires: mesa-libGLU + %description Erlang is a general-purpose programming language and runtime @@ -47,6 +58,8 @@ systems from Ericsson. %package doc Summary: Erlang documentation Group: Development/Languages +BuildArch: noarch +Obsoletes: %{name}-doc < R13B-04.4 %description doc Documentation for Erlang. @@ -56,6 +69,9 @@ Documentation for Erlang. %setup -q -n otp_src_%{ver}%{rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath +%patch6 -p1 -b .fix_shared_lib_install +%patch7 -p1 -b .dlopen_opengl_libs +%patch8 -p1 -b .pcre_overflow # remove shipped zlib sources rm -f erts/emulator/zlib/*.[ch] @@ -128,16 +144,6 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc -# fix permissions for asn1 library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/priv/lib/asn1_erl_drv.so - -# fix permissions for megaco library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv.so -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/megaco-*/priv/lib/megaco_flex_scanner_drv_mt.so - -# fix permissons for wx library -chmod 755 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/priv/*/wxe_driver.so - # Install RPM related files install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.escript install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.sh @@ -174,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 17 2010 Peter Lemenkov - R13B-04.4 +- Added missing Requires mesa-libGL{U} for wx module (rhbz #583287) +- Fix for buffer overflow in pcre module (rhbz #583288) +- Doc sub-package marked as noarch (partially resolves rhbz #491165) + * Fri Mar 26 2010 Peter Lemenkov - R13B-04.3 - Added rpm-related stuff for auto-generating erlang dependencies in the future builds - Since now *.yrl files are removed too. diff --git a/import.log b/import.log index 5537ce7..1ad99e1 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 +erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch index 61e089e..5f9594f 100644 --- a/otp-0001-Do-not-format-man-pages.patch +++ b/otp-0001-Do-not-format-man-pages.patch @@ -1,7 +1,7 @@ From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:45:28 +0300 -Subject: [PATCH 1/2] Do not format man-pages +Subject: [PATCH 1/9] Do not format man-pages Signed-off-by: Peter Lemenkov --- @@ -28,5 +28,5 @@ index 83f9690..d26137d 100644 - exit 0 -- -1.6.2.5 +1.6.6.1 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index ffc6cde..0293073 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -1,7 +1,7 @@ From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH 2/2] Remove rpath +Subject: [PATCH 2/9] Remove rpath Signed-off-by: Peter Lemenkov --- @@ -68,5 +68,5 @@ index 49a209f..5e6c74e 100644 SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ -- -1.6.2.5 +1.6.6.1 diff --git a/otp-0006-Fix-shared-libraries-installation.patch b/otp-0006-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..2df3cb4 --- /dev/null +++ b/otp-0006-Fix-shared-libraries-installation.patch @@ -0,0 +1,58 @@ +From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 15 Apr 2010 13:31:36 +0400 +Subject: [PATCH 6/9] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files +previously. + +Signed-off-by: Peter Lemenkov +--- + lib/asn1/c_src/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/wx/c_src/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 906c513..9e9cb18 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 6ce9b34..5af651d 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -280,7 +280,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in +index 5a0b4ce..8710641 100644 +--- a/lib/wx/c_src/Makefile.in ++++ b/lib/wx/c_src/Makefile.in +@@ -167,7 +167,7 @@ release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) + $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ + $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ +- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) ++ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) + + release_docs_spec: + +-- +1.6.6.1 + diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch new file mode 100644 index 0000000..5e78c4a --- /dev/null +++ b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch @@ -0,0 +1,35 @@ +From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 16 Apr 2010 21:13:47 +0400 +Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU + +Signed-off-by: Peter Lemenkov +--- + lib/wx/c_src/wxe_gl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp +index 63dd68f..36bf15f 100644 +--- a/lib/wx/c_src/wxe_gl.cpp ++++ b/lib/wx/c_src/wxe_gl.cpp +@@ -81,7 +81,7 @@ int initOpenGL() + WCHAR * DLName = wxT("opengl32.dll"); + HMODULE LIBhandle = LoadLibrary(DLName); + #else +- char * DLName = (char *) "libGL.so"; ++ char * DLName = (char *) "libGL.so.1"; + void * LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +@@ -132,7 +132,7 @@ int initOpenGL() + DLName = wxT("glu32.dll"); + LIBhandle = LoadLibrary(DLName); + #else +- DLName = (char *) "libGLU.so"; ++ DLName = (char *) "libGLU.so.1"; + LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +-- +1.6.6.1 + diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0008-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..2e34451 --- /dev/null +++ b/otp-0008-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001 +From: Michael Santos +Date: Thu, 18 Mar 2010 20:08:10 -0400 +Subject: [PATCH 8/9] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 2974336..9508c5a 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2445,7 +2450,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2494,7 +2499,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + -- cgit From ebcf8fdce813f71829a3897194cb6d3898aacee7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 26 Apr 2010 08:43:27 +0000 Subject: Modularization of erlang package --- erlang.spec | 959 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- import.log | 1 + 2 files changed, 929 insertions(+), 31 deletions(-) diff --git a/erlang.spec b/erlang.spec index eb436fa..c622ce4 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,9 +1,11 @@ +%{?__erlang_provides_requires: %{__erlang_provides_requires}} + %define ver R13B %define rel 04 Name: erlang Version: %{ver} -Release: %{rel}.4%{?dist} +Release: %{rel}.5%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -34,19 +36,66 @@ 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: java-1.6.0-openjdk-devel BuildRequires: flex BuildRequires: m4 BuildRequires: fop -Requires: tk -Requires: mesa-libGL -Requires: mesa-libGLU - +Requires: erlang-appmon = %{version}-%{release} +Requires: erlang-asn1 = %{version}-%{release} +Requires: erlang-common_test = %{version}-%{release} +Requires: erlang-compiler = %{version}-%{release} +Requires: erlang-cosEvent = %{version}-%{release} +Requires: erlang-cosEventDomain = %{version}-%{release} +Requires: erlang-cosFileTransfer = %{version}-%{release} +Requires: erlang-cosNotification = %{version}-%{release} +Requires: erlang-cosProperty = %{version}-%{release} +Requires: erlang-cosTime = %{version}-%{release} +Requires: erlang-cosTransaction = %{version}-%{release} +Requires: erlang-crypto = %{version}-%{release} +Requires: erlang-debugger = %{version}-%{release} +Requires: erlang-dialyzer = %{version}-%{release} +Requires: erlang-docbuilder = %{version}-%{release} +Requires: erlang-edoc = %{version}-%{release} +Requires: erlang-erl_docgen = %{version}-%{release} +Requires: erlang-erl_interface = %{version}-%{release} +Requires: erlang-erts = %{version}-%{release} +Requires: erlang-et = %{version}-%{release} +Requires: erlang-eunit = %{version}-%{release} +Requires: erlang-examples = %{version}-%{release} +Requires: erlang-gs = %{version}-%{release} +Requires: erlang-hipe = %{version}-%{release} +Requires: erlang-ic = %{version}-%{release} +Requires: erlang-inets = %{version}-%{release} +Requires: erlang-inviso = %{version}-%{release} +Requires: erlang-jinterface = %{version}-%{release} +Requires: erlang-kernel = %{version}-%{release} +Requires: erlang-megaco = %{version}-%{release} +Requires: erlang-mnesia = %{version}-%{release} +Requires: erlang-observer = %{version}-%{release} +Requires: erlang-odbc = %{version}-%{release} +Requires: erlang-orber = %{version}-%{release} +Requires: erlang-os_mon = %{version}-%{release} +Requires: erlang-otp_mibs = %{version}-%{release} +Requires: erlang-parsetools = %{version}-%{release} +Requires: erlang-percept = %{version}-%{release} +Requires: erlang-pman = %{version}-%{release} +Requires: erlang-public_key = %{version}-%{release} +Requires: erlang-reltool = %{version}-%{release} +Requires: erlang-runtime_tools = %{version}-%{release} +Requires: erlang-sasl = %{version}-%{release} +Requires: erlang-snmp = %{version}-%{release} +Requires: erlang-ssh = %{version}-%{release} +Requires: erlang-ssl = %{version}-%{release} +Requires: erlang-stdlib = %{version}-%{release} +Requires: erlang-syntax_tools = %{version}-%{release} +Requires: erlang-test_server = %{version}-%{release} +Requires: erlang-toolbar = %{version}-%{release} +Requires: erlang-tools = %{version}-%{release} +Requires: erlang-tv = %{version}-%{release} +Requires: erlang-typer = %{version}-%{release} +Requires: erlang-webtool = %{version}-%{release} +Requires: erlang-wx = %{version}-%{release} +Requires: erlang-xmerl = %{version}-%{release} %description Erlang is a general-purpose programming language and runtime @@ -54,6 +103,131 @@ environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication systems from Ericsson. +%package appmon +Summary: A utility used to supervise Applications executing on several Erlang nodes +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description appmon +A utility used to supervise Applications executing on several Erlang nodes. + +%package asn1 +Summary: Provides support for Abstract Syntax Notation One +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description asn1 +Provides support for Abstract Syntax Notation One. + +%package common_test +Summary: A portable framework for automatic testing +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description common_test +A portable framework for automatic testing. + +%package compiler +Summary: A byte code compiler for Erlang which produces highly compact code +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description compiler +A byte code compiler for Erlang which produces highly compact code. + +%package cosEvent +Summary: Orber OMG Event Service +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description cosEvent +Orber OMG Event Service. + +%package cosEventDomain +Summary: Orber OMG Event Domain Service +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description cosEventDomain +Orber OMG Event Domain Service. + +%package cosFileTransfer +Summary: Orber OMG File Transfer Service +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description cosFileTransfer +Orber OMG File Transfer Service. + +%package cosNotification +Summary: Orber OMG Notification Service +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description cosNotification +Orber OMG Notification Service. + +%package cosProperty +Summary: Orber OMG Property Service +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description cosProperty +Orber OMG Property Service. + +%package cosTime +Summary: Orber OMG Timer and TimerEvent Service +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description cosTime +Orber OMG Timer and TimerEvent Service. + +%package cosTransaction +Summary: Orber OMG Transaction Service +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description cosTransaction +Orber OMG Transaction Service. + +%package crypto +Summary: Cryptographical support +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description crypto +Cryptographical support. + +%package debugger +Summary: A debugger for debugging and testing of Erlang programs +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description debugger +A debugger for debugging and testing of Erlang programs. + +%package dialyzer +Summary: A DIscrepany AnaLYZer for ERlang programs +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description dialyzer +A DIscrepany AnaLYZer for ERlang programs. %package doc Summary: Erlang documentation @@ -64,6 +238,401 @@ Obsoletes: %{name}-doc < R13B-04.4 %description doc Documentation for Erlang. +%package docbuilder +Summary: Tool for generating HTML documentation for applications +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description docbuilder +Tool for generating HTML documentation for applications. + +%package edoc +Summary: A utility used to generate documentation out of tags in source files +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description edoc +A utility used to generate documentation out of tags in source files. + +%package erl_docgen +Summary: A utility used to generate erlang HTML documentation +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description erl_docgen +A utility used to generate erlang HTML documentation. + +%package erl_interface +Summary: Low level interface to C +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description erl_interface +Low level interface to C. + +%package erts +Summary: Functionality necessary to run the Erlang System itself +Group: Development/Languages +Obsoletes: %{name} < R13B-04.5 + +%description erts +Functionality necessary to run the Erlang System itself. + +%package et +Summary: An event tracer for Erlang programs +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description et +An event tracer for Erlang programs. + +%package eunit +Summary: Support for unit testing +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description eunit +Support for unit testing. + +%package examples +Summary: Examples for some Erlang modules +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description examples +Examples for some Erlang modules. + +%package gs +Summary: A library for Tcl/Tk support in Erlang +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +BuildRequires: tcl-devel +BuildRequires: tk-devel +Requires: tk +Obsoletes: %{name} < R13B-04.5 + +%description gs +A Graphics System used to write platform independent user interfaces. + +%package hipe +Summary: High Performance Erlang +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description hipe +High Performance Erlang. + +%package ic +Summary: IDL compiler +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description ic +IDL compiler. + +%package inets +Summary: A set of services such as a Web server and a ftp client etc +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description inets +A set of services such as a Web server and a ftp client etc. + +%package inviso +Summary: A trace tool for both development and delivered systems +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description inviso +A trace tool for both development and delivered systems. + +%package jinterface +Summary: A library for accessing Java from Erlang +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 +BuildRequires: java-1.6.0-openjdk-devel + +%description jinterface +Low level interface to Java. + +%package kernel +Summary: Main erlang library +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description kernel +Main erlang library. + +%package megaco +Summary: Megaco/H.248 support library +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description megaco +Megaco/H.248 is a protocol for control of elements in a physically +decomposed multimedia gateway, enabling separation of call control +from media conversion. + +%package mnesia +Summary: A heavy duty real-time distributed database +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description mnesia +A heavy duty real-time distributed database. + +%package observer +Summary: A set of tools for tracing and investigation of distributed systems +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description observer +A set of tools for tracing and investigation of distributed systems. + +%package odbc +Summary: A library for unixODBC support in Erlang +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 +BuildRequires: unixODBC-devel + +%description odbc +An interface to relational SQL-databases built on ODBC (Open Database +Connectivity). + +%package orber +Summary: A CORBA Object Request Broker +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description orber +A CORBA Object Request Broker. + +%package os_mon +Summary: A monitor which allows inspection of the underlying operating system +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description os_mon +A monitor which allows inspection of the underlying operating system. + +%package otp_mibs +Summary: SNMP management information base for Erlang/OTP nodes +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description otp_mibs +SNMP management information base for Erlang/OTP nodes. + +%package parsetools +Summary: A set of parsing and lexical analysis tools +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description parsetools +A set of parsing and lexical analysis tools. + +%package percept +Summary: A concurrency profiler tool +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description percept +A concurrency profiler tool. + +%package pman +Summary: A graphical process manager used to inspect Erlang processes +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description pman +A graphical process manager used to inspect Erlang processes. + +%package public_key +Summary: API to public key infrastructure +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description public_key +API to public key infrastructure. + +%package reltool +Summary: A release management tool +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description reltool +Reltool is a release management tool. It analyses a given +Erlang/OTP installation and determines various dependencies +between applications. The graphical frontend depicts the +dependencies and enables interactive customization of a +target system. The backend provides a batch interface +for generation of customized target systems. + +%package runtime_tools +Summary: A set of tools to include in a production system +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description runtime_tools +A set of tools to include in a production system. + +%package sasl +Summary: The System Architecture Support Libraries +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description sasl +The System Architecture Support Libraries is a set of tools for +release upgrades and alarm handling etc. + +%package snmp +Summary: Simple Network Management Protocol (SNMP) support +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description snmp +Simple Network Management Protocol (SNMP) support including a +MIB compiler and tools for creating SNMP agents. + +%package ssh +Summary: Secure Shell application with sftp and ssh support +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description ssh +Secure Shell application with sftp and ssh support. + +%package ssl +Summary: Secure Socket Layer support +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description ssl +Secure Socket Layer support. + +%package stdlib +Summary: The Erlang standard libraries +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description stdlib +The Erlang standard libraries. + +%package syntax_tools +Summary: A set of tools for dealing with erlang sources +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description syntax_tools +A utility used to handle abstract Erlang syntax trees, +reading source files differently, pretty-printing syntax trees. + +%package test_server +Summary: The OTP Test Server +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description test_server +The OTP Test Server. + +%package toolbar +Summary: A tool bar simplifying access to the Erlang tools +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description toolbar +A tool bar simplifying access to the Erlang tools. + +%package tools +Summary: A set of programming tools including a coverage analyzer etc +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description tools +A set of programming tools including a coverage analyzer etc. + +%package tv +Summary: An ETS and MNESIA graphical table visualizer +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description tv +An ETS and MNESIA graphical table visualizer. + +%package typer +Summary: TYPe annotator for ERlang programs +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description typer +TYPe annotator for ERlang programs. + +%package webtool +Summary: A tool that simplifying the use of web based Erlang tools +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description webtool +A tool that simplifying the use of web based Erlang tools. + +%package wx +Summary: A library for wxWidgets support in Erlang +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Requires: mesa-libGL +Requires: mesa-libGLU +Obsoletes: %{name} < R13B-04.5 +BuildRequires: wxGTK-devel + +%description wx +A Graphics System used to write platform independent user interfaces. + +%package xmerl +Summary: Provides support for XML 1.0 +Group: Development/Languages +Requires: %{name}-erts = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description xmerl +Provides support for XML 1.0. %prep %setup -q -n otp_src_%{ver}%{rel} @@ -89,12 +658,15 @@ make rm -rf $RPM_BUILD_ROOT 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 +# fix 0775 permission on some directories +find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755 + +# Fix 664 file mode +chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/c_src/Makefile +chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Makefile +chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile +chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile +chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj/Makefile # install additional doc files mkdir -p erlang_doc @@ -112,17 +684,20 @@ 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} +# Remove batch files intended to use on one proprietary OS. +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/etop.bat +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/getop.bat +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/webtool-*/priv/bin/start_webtool.bat + +# Remove old txt files +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/otpCA/index.txt.old +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/erlangCA/index.txt.old -# remove unneeded sources, but keep *.hrl and *.yrl -for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -maxdepth 1 -type f ! -name "*.hrl" -print -delete || true ; done +# remove unneeded Erlang sources, but keep *.hrl files +for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -type f ! -name "*.hrl" -print -delete || true ; done rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/{cerl,flow,icode,main,misc,util}/*.erl rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/orber-*/COSS/CosNaming/*.erl -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/snmp-*/src/{agent,app,compiler,manager,misc}/*.erl -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/wx-*/src/gen/*.erl -find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -maxdepth 2 -type d -name src -empty -delete +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*/src -type d -empty -delete # remove C and Java sources rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src @@ -133,17 +708,23 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/java_src rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/c_src rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src -# remove empty or intermediate files and directories +# remove empty directories rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man + +# remove unneeded files rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosEvent-*/info rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosEventDomain-*/info -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/crypto-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk -rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj + +# No longer needed utilities for formatting man-pages rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc +# Remove *.o files +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/crypto-*/priv/obj +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj + # Install RPM related files install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.escript install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.sh @@ -158,9 +739,11 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) + %doc AUTHORS EPLICENCE README.md -%{_bindir}/* -%{_libdir}/erlang +%doc %{_libdir}/erlang/PR.template +%doc %{_libdir}/erlang/README +%doc %{_libdir}/erlang/COPYRIGHT # RPM stuff %{_sysconfdir}/rpm/macros.erlang @@ -169,17 +752,331 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/rpm/erlang-find-requires.escript %{_libdir}/rpm/erlang-find-requires.sh +%files appmon +%defattr(-,root,root) +%{_libdir}/erlang/lib/appmon-*/ + +%files asn1 +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/asn1-*/ +%{_libdir}/erlang/lib/asn1-*/ebin +%{_libdir}/erlang/lib/asn1-*/priv +%{_libdir}/erlang/lib/asn1-*/src + +%files common_test +%defattr(-,root,root) +%{_libdir}/erlang/lib/common_test-*/ + +%files compiler +%defattr(-,root,root) +%{_libdir}/erlang/lib/compiler-*/ + +%files cosEvent +%defattr(-,root,root) +%{_libdir}/erlang/lib/cosEvent-*/ + +%files cosEventDomain +%defattr(-,root,root) +%{_libdir}/erlang/lib/cosEventDomain-*/ + +%files cosFileTransfer +%defattr(-,root,root) +%{_libdir}/erlang/lib/cosFileTransfer-*/ + +%files cosNotification +%defattr(-,root,root) +%{_libdir}/erlang/lib/cosNotification-*/ + +%files cosProperty +%defattr(-,root,root) +%{_libdir}/erlang/lib/cosProperty-*/ + +%files cosTime +%defattr(-,root,root) +%{_libdir}/erlang/lib/cosTime-*/ + +%files cosTransaction +%defattr(-,root,root) +%{_libdir}/erlang/lib/cosTransactions-*/ + +%files crypto +%defattr(-,root,root) +%{_libdir}/erlang/lib/crypto-*/ + +%files debugger +%defattr(-,root,root) +%{_libdir}/erlang/lib/debugger-*/ + +%files dialyzer +%defattr(-,root,root) +%{_libdir}/erlang/lib/dialyzer-*/ %files doc %defattr(-,root,root) %doc erlang_doc/* +%files docbuilder +%defattr(-,root,root) +%{_libdir}/erlang/lib/docbuilder-*/ + +%files edoc +%defattr(-,root,root) +%{_libdir}/erlang/lib/edoc-*/ + +%files erl_docgen +%defattr(-,root,root) +%{_libdir}/erlang/lib/erl_docgen-*/ + +%files erl_interface +%defattr(-,root,root) +%{_libdir}/erlang/lib/erl_interface-*/ + +%files erts +%defattr(-,root,root) +%dir %{_libdir}/erlang +%dir %{_libdir}/erlang/lib/ +%{_bindir}/* +%{_libdir}/erlang/bin/ +%{_libdir}/erlang/erts-*/ +%{_libdir}/erlang/lib/erts-*/ +%{_libdir}/erlang/man/ +%{_libdir}/erlang/releases/ +%{_libdir}/erlang/usr/ +%{_libdir}/erlang/Install + +%files et +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/et-*/ +%{_libdir}/erlang/lib/et-*/ebin +%{_libdir}/erlang/lib/et-*/include +%{_libdir}/erlang/lib/et-*/src + +%files eunit +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/eunit-*/ +%{_libdir}/erlang/lib/eunit-*/ebin +%{_libdir}/erlang/lib/eunit-*/include + +%files examples +%defattr(-,root,root) +%{_libdir}/erlang/lib/asn1-*/examples +%{_libdir}/erlang/lib/et-*/examples +%{_libdir}/erlang/lib/eunit-*/examples +%{_libdir}/erlang/lib/gs-*/examples +%{_libdir}/erlang/lib/ic-*/examples +%{_libdir}/erlang/lib/inets-*/examples +%{_libdir}/erlang/lib/kernel-*/examples +%{_libdir}/erlang/lib/megaco-*/examples +%{_libdir}/erlang/lib/mnesia-*/examples +%{_libdir}/erlang/lib/orber-*/examples +%{_libdir}/erlang/lib/reltool-*/examples +%{_libdir}/erlang/lib/snmp-*/examples +%{_libdir}/erlang/lib/ssl-*/examples +%{_libdir}/erlang/lib/stdlib-*/examples +%{_libdir}/erlang/lib/syntax_tools-*/examples +%{_libdir}/erlang/lib/tools-*/examples +%{_libdir}/erlang/lib/wx-*/examples + +%files gs +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/gs-*/ +%{_libdir}/erlang/lib/gs-*/contribs +%{_libdir}/erlang/lib/gs-*/ebin +%{_libdir}/erlang/lib/gs-*/priv +%{_libdir}/erlang/lib/gs-*/src + +%files hipe +%defattr(-,root,root) +%{_libdir}/erlang/lib/hipe-*/ + +%files ic +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/ic-*/ +%{_libdir}/erlang/lib/ic-*/ebin +%{_libdir}/erlang/lib/ic-*/include +%{_libdir}/erlang/lib/ic-*/priv +%{_libdir}/erlang/lib/ic-*/src + +%files inets +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/inets-*/ +%{_libdir}/erlang/lib/inets-*/ebin +%{_libdir}/erlang/lib/inets-*/priv +%{_libdir}/erlang/lib/inets-*/src + +%files inviso +%defattr(-,root,root) +%{_libdir}/erlang/lib/inviso-*/ + +%files jinterface +%defattr(-,root,root) +%{_libdir}/erlang/lib/jinterface-*/ + +%files kernel +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/kernel-*/ +%{_libdir}/erlang/lib/kernel-*/ebin +%{_libdir}/erlang/lib/kernel-*/include +%{_libdir}/erlang/lib/kernel-*/src + +%files megaco +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/megaco-*/ +%{_libdir}/erlang/lib/megaco-*/ebin +%{_libdir}/erlang/lib/megaco-*/include +%{_libdir}/erlang/lib/megaco-*/priv +%{_libdir}/erlang/lib/megaco-*/src + +%files mnesia +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/mnesia-*/ +%{_libdir}/erlang/lib/mnesia-*/ebin +%{_libdir}/erlang/lib/mnesia-*/include +%{_libdir}/erlang/lib/mnesia-*/src + +%files observer +%defattr(-,root,root) +%{_libdir}/erlang/lib/observer-*/ + +%files odbc +%defattr(-,root,root) +%{_libdir}/erlang/lib/odbc-*/ + +%files orber +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/orber-*/ +%{_libdir}/erlang/lib/orber-*/COSS +%{_libdir}/erlang/lib/orber-*/ebin +%{_libdir}/erlang/lib/orber-*/include +%{_libdir}/erlang/lib/orber-*/java_src +%{_libdir}/erlang/lib/orber-*/priv +%{_libdir}/erlang/lib/orber-*/src + +%files os_mon +%defattr(-,root,root) +%{_libdir}/erlang/lib/os_mon-*/ + +%files otp_mibs +%defattr(-,root,root) +%{_libdir}/erlang/lib/otp_mibs-*/ + +%files parsetools +%defattr(-,root,root) +%{_libdir}/erlang/lib/parsetools-*/ + +%files percept +%defattr(-,root,root) +%{_libdir}/erlang/lib/percept-*/ + +%files pman +%defattr(-,root,root) +%{_libdir}/erlang/lib/pman-*/ + +%files public_key +%defattr(-,root,root) +%{_libdir}/erlang/lib/public_key-*/ + +%files reltool +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/reltool-*/ +%{_libdir}/erlang/lib/reltool-*/ebin +%{_libdir}/erlang/lib/reltool-*/src + +%files runtime_tools +%defattr(-,root,root) +%{_libdir}/erlang/lib/runtime_tools-*/ + +%files sasl +%defattr(-,root,root) +%{_libdir}/erlang/lib/sasl-*/ + +%files snmp +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/snmp-*/ +%{_libdir}/erlang/lib/snmp-*/ebin +%{_libdir}/erlang/lib/snmp-*/include +%{_libdir}/erlang/lib/snmp-*/mibs +%{_libdir}/erlang/lib/snmp-*/priv +%{_libdir}/erlang/lib/snmp-*/src + +%files ssh +%defattr(-,root,root) +%{_libdir}/erlang/lib/ssh-*/ + +%files ssl +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/ssl-*/ +%{_libdir}/erlang/lib/ssl-*/ebin +%{_libdir}/erlang/lib/ssl-*/include +%{_libdir}/erlang/lib/ssl-*/pkix +%{_libdir}/erlang/lib/ssl-*/priv +%{_libdir}/erlang/lib/ssl-*/src + +%files stdlib +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/stdlib-*/ +%{_libdir}/erlang/lib/stdlib-*/ebin +%{_libdir}/erlang/lib/stdlib-*/include +%{_libdir}/erlang/lib/stdlib-*/src + +%files syntax_tools +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/syntax_tools-*/ +%{_libdir}/erlang/lib/syntax_tools-*/ebin + +%files test_server +%defattr(-,root,root) +%{_libdir}/erlang/lib/test_server-*/ + +%files toolbar +%defattr(-,root,root) +%{_libdir}/erlang/lib/toolbar-*/ + +%files tools +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/tools-*/ +%{_libdir}/erlang/lib/tools-*/bin +%{_libdir}/erlang/lib/tools-*/ebin +%{_libdir}/erlang/lib/tools-*/emacs +%{_libdir}/erlang/lib/tools-*/priv +%{_libdir}/erlang/lib/tools-*/src + +%files tv +%defattr(-,root,root) +%{_libdir}/erlang/lib/tv-*/ + +%files typer +%defattr(-,root,root) +%{_libdir}/erlang/lib/typer-*/ + +%files webtool +%defattr(-,root,root) +%{_libdir}/erlang/lib/webtool-*/ + +%files wx +%defattr(-,root,root) +%dir %{_libdir}/erlang/lib/wx-*/ +%{_libdir}/erlang/lib/wx-*/ebin +%{_libdir}/erlang/lib/wx-*/include +%{_libdir}/erlang/lib/wx-*/priv +%{_libdir}/erlang/lib/wx-*/src + +%files xmerl +%defattr(-,root,root) +%{_libdir}/erlang/lib/xmerl-*/ + %post -%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null +%{_libdir}/erlang/Install -minimal -cross %{_libdir}/erlang >/dev/null 2>/dev/null %changelog +* Wed Apr 17 2010 Peter Lemenkov - R13B-04.5 +- Use erlang rpm macros for adding provides/reqires +- All %%{_libdir}/erlang/lib/* items were splitted off from main package, which + in turn becomes purely virtual now. +- Removing RPM_BUILD_ROOT from several installed files is no longer required + * Sat Apr 17 2010 Peter Lemenkov - R13B-04.4 - Added missing Requires mesa-libGL{U} for wx module (rhbz #583287) - Fix for buffer overflow in pcre module (rhbz #583288) diff --git a/import.log b/import.log index 1ad99e1..1c80656 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 +erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 -- cgit From a943e713d603fb441cf7fe3f0f66fc8b7a4efa07 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 26 Apr 2010 17:43:10 +0000 Subject: Fix installation path for erlang-rpm-macros --- erlang-find-provides.sh | 3 ++- erlang.spec | 39 ++++++++++++++++++++++++++------------- import.log | 1 + 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/erlang-find-provides.sh b/erlang-find-provides.sh index 0592130..10cf41e 100755 --- a/erlang-find-provides.sh +++ b/erlang-find-provides.sh @@ -63,7 +63,7 @@ for f in $appfiles; do echo "erlang($app) = $ver" done -# Check for very special case - erts, by guessing by directory name +# Check for two special cases by inspecting path to ebin directory basedirs=$(echo $filelist | tr [:blank:] '\n' | grep -o -E 'erlang\/lib\/[a-zA-Z_0-9]*-[0-9.]*\/ebin' | cut -d \/ -f 3 | sort | uniq) for bd in $basedirs; do basename=`echo $bd | cut -d \- -f 1` @@ -84,6 +84,7 @@ for bd in $basedirs; do grep "bif " $BUILDDIR/erts/emulator/hipe/*.tab | awk -F "bif " '{print "erlang(" $2 ")"}' ;; "wx") + # wx module doesn't contain app-file. echo "erlang($basename) = $basever" ;; *) diff --git a/erlang.spec b/erlang.spec index c622ce4..dc4e6d2 100644 --- a/erlang.spec +++ b/erlang.spec @@ -5,7 +5,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.5%{?dist} +Release: %{rel}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -81,6 +81,7 @@ Requires: erlang-percept = %{version}-%{release} Requires: erlang-pman = %{version}-%{release} Requires: erlang-public_key = %{version}-%{release} Requires: erlang-reltool = %{version}-%{release} +Requires: erlang-rpm-macros = %{version}-%{release} Requires: erlang-runtime_tools = %{version}-%{release} Requires: erlang-sasl = %{version}-%{release} Requires: erlang-snmp = %{version}-%{release} @@ -493,6 +494,14 @@ dependencies and enables interactive customization of a target system. The backend provides a batch interface for generation of customized target systems. +%package rpm-macros +Summary: Necessary macros for building Erlang +Group: Development/Languages +Obsoletes: %{name} < R13B-04.5 + +%description rpm-macros +Necessary macros for building Erlang. + %package runtime_tools Summary: A set of tools to include in a production system Group: Development/Languages @@ -666,7 +675,6 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/c_src/ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile -chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj/Makefile # install additional doc files mkdir -p erlang_doc @@ -726,10 +734,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj # Install RPM related files -install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.escript -install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.sh -install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.escript -install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.sh +install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.escript +install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.sh +install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.escript +install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.sh install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang @@ -745,13 +753,6 @@ rm -rf $RPM_BUILD_ROOT %doc %{_libdir}/erlang/README %doc %{_libdir}/erlang/COPYRIGHT -# RPM stuff -%{_sysconfdir}/rpm/macros.erlang -%{_libdir}/rpm/erlang-find-provides.escript -%{_libdir}/rpm/erlang-find-provides.sh -%{_libdir}/rpm/erlang-find-requires.escript -%{_libdir}/rpm/erlang-find-requires.sh - %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ @@ -982,6 +983,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src +%files rpm-macros +%defattr(-,root,root) +%{_sysconfdir}/rpm/macros.erlang +%{_rpmconfigdir}/erlang-find-provides.escript +%{_rpmconfigdir}/erlang-find-provides.sh +%{_rpmconfigdir}/erlang-find-requires.escript +%{_rpmconfigdir}/erlang-find-requires.sh + %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ @@ -1071,6 +1080,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 26 2010 Peter Lemenkov - R13B-04.6 +- Made erlang-rpm-macros as separate package +- Fix error while installing erlang-rpm-macros + * Wed Apr 17 2010 Peter Lemenkov - R13B-04.5 - Use erlang rpm macros for adding provides/reqires - All %%{_libdir}/erlang/lib/* items were splitted off from main package, which diff --git a/import.log b/import.log index 1c80656..97016fb 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 +erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 -- cgit From c4f14d03ec3540011fbc620decc0e18bc27929c4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 29 Apr 2010 08:08:36 +0000 Subject: Added autogenerated deps, fixed install of emacs files and much more --- .cvsignore | 2 - erlang.spec | 775 +++++++++++++++++++-- import.log | 1 + otp-0001-Do-not-format-man-pages.patch | 2 +- otp-0002-Remove-rpath.patch | 2 +- otp-0004-Fix-shared-libraries-installation.patch | 58 ++ otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch | 35 + ...-Fix-check-for-compile-workspace-overflow.patch | 55 ++ otp-0006-Fix-shared-libraries-installation.patch | 58 -- otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch | 35 - otp-0007-Install-missing-emacs-files.patch | 28 + ...-Fix-check-for-compile-workspace-overflow.patch | 55 -- sources | 2 - 13 files changed, 892 insertions(+), 216 deletions(-) create mode 100644 otp-0004-Fix-shared-libraries-installation.patch create mode 100644 otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0006-Fix-check-for-compile-workspace-overflow.patch delete mode 100644 otp-0006-Fix-shared-libraries-installation.patch delete mode 100644 otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch create mode 100644 otp-0007-Install-missing-emacs-files.patch delete mode 100644 otp-0008-Fix-check-for-compile-workspace-overflow.patch diff --git a/.cvsignore b/.cvsignore index 697a4fc..ae1a587 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -otp_doc_html_R13B04.tar.gz -otp_doc_man_R13B04.tar.gz otp_src_R13B04.tar.gz diff --git a/erlang.spec b/erlang.spec index dc4e6d2..c59a8ce 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,42 +3,45 @@ %define ver R13B %define rel 04 -Name: erlang -Version: %{ver} -Release: %{rel}.6%{?dist} -Summary: General-purpose programming language and runtime environment - -Group: Development/Languages -License: ERPL -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 +Name: erlang +Version: %{ver} +Release: %{rel}.9%{?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_%{ver}%{rel}.tar.gz Source3: erlang-find-provides.escript Source4: erlang-find-provides.sh Source5: erlang-find-requires.escript Source6: erlang-find-requires.sh Source7: macros.erlang # TODO this patch needs rebase against current tree -Patch0: otp-links.patch +Patch0: otp-links.patch # Fedora-specific Patch1: otp-0001-Do-not-format-man-pages.patch # Fedora-specific Patch2: otp-0002-Remove-rpath.patch # Upstreamed -Patch6: otp-0006-Fix-shared-libraries-installation.patch +Patch4: otp-0004-Fix-shared-libraries-installation.patch # Fedora-specific -Patch7: otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +Patch5: otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch # Upstreamed -Patch8: otp-0008-Fix-check-for-compile-workspace-overflow.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch6: otp-0006-Fix-check-for-compile-workspace-overflow.patch +# Install accidentally forgotten emacs files (see rhbz #585349) (already fixed upstream) +Patch7: otp-0007-Install-missing-emacs-files.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel BuildRequires: zlib-devel -BuildRequires: flex +BuildRequires: flex BuildRequires: m4 BuildRequires: fop +BuildRequires: libxslt +# Required for erlang-rpm-macros +BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} Requires: erlang-asn1 = %{version}-%{release} @@ -50,7 +53,7 @@ Requires: erlang-cosFileTransfer = %{version}-%{release} Requires: erlang-cosNotification = %{version}-%{release} Requires: erlang-cosProperty = %{version}-%{release} Requires: erlang-cosTime = %{version}-%{release} -Requires: erlang-cosTransaction = %{version}-%{release} +Requires: erlang-cosTransactions = %{version}-%{release} Requires: erlang-crypto = %{version}-%{release} Requires: erlang-debugger = %{version}-%{release} Requires: erlang-dialyzer = %{version}-%{release} @@ -194,13 +197,14 @@ Obsoletes: %{name} < R13B-04.5 %description cosTime Orber OMG Timer and TimerEvent Service. -%package cosTransaction +%package cosTransactions Summary: Orber OMG Transaction Service Group: Development/Languages Requires: %{name}-erts = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 +Obsoletes: %{name}-cosTransaction < R13B-04.7 -%description cosTransaction +%description cosTransactions Orber OMG Transaction Service. %package crypto @@ -234,6 +238,7 @@ A DIscrepany AnaLYZer for ERlang programs. Summary: Erlang documentation Group: Development/Languages BuildArch: noarch +Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-doc < R13B-04.4 %description doc @@ -647,9 +652,10 @@ Provides support for XML 1.0. %setup -q -n otp_src_%{ver}%{rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath -%patch6 -p1 -b .fix_shared_lib_install -%patch7 -p1 -b .dlopen_opengl_libs -%patch8 -p1 -b .pcre_overflow +%patch4 -p1 -b .fix_shared_lib_install +%patch5 -p1 -b .dlopen_opengl_libs +%patch6 -p1 -b .pcre_overflow +%patch7 -p1 -b .missing_emacs_files # remove shipped zlib sources rm -f erts/emulator/zlib/*.[ch] @@ -661,11 +667,13 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif make +make docs %install rm -rf $RPM_BUILD_ROOT -make INSTALL_PREFIX=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install-docs # fix 0775 permission on some directories find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755 @@ -676,26 +684,32 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Ma chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile -# install additional doc files -mkdir -p erlang_doc -tar -C erlang_doc -zxf %{SOURCE1} - -# install man-pages -tar -C $RPM_BUILD_ROOT%{_libdir}/erlang -zxf %{SOURCE2} -gzip $RPM_BUILD_ROOT%{_libdir}/erlang/man/man*/* - -# make links to binaries -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cd $RPM_BUILD_ROOT%{_bindir} -for file in erl erlc escript dialyzer -do - ln -sf ../%{_lib}/erlang/bin/$file . -done - -# Remove batch files intended to use on one proprietary OS. +# Relocate doc-files into the proper directory +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib +pushd . +cd $RPM_BUILD_ROOT%{_libdir}/erlang +mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done +cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib +for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done +popd +cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel} + +# Win32-specific functionality rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/etop.bat rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/getop.bat +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/os_mon-*/ebin/nteventlog.beam rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/webtool-*/priv/bin/start_webtool.bat +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.* +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.* + +# VxWorks specific +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.* # Remove old txt files rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/otpCA/index.txt.old @@ -706,6 +720,7 @@ for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -type f ! -name rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/{cerl,flow,icode,main,misc,util}/*.erl rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/orber-*/COSS/CosNaming/*.erl find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*/src -type d -empty -delete +rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosFileTransfer-*/src # remove C and Java sources rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src @@ -716,14 +731,12 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/java_src rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/c_src rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src -# remove empty directories -rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/doc +# remove empty directory rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man # remove unneeded files -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosEvent-*/info -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosEventDomain-*/info -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk # No longer needed utilities for formatting man-pages rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc @@ -740,6 +753,8 @@ install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-req install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.sh install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang +# remove outdated script +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/Install %clean rm -rf $RPM_BUILD_ROOT @@ -747,15 +762,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) - -%doc AUTHORS EPLICENCE README.md -%doc %{_libdir}/erlang/PR.template -%doc %{_libdir}/erlang/README -%doc %{_libdir}/erlang/COPYRIGHT +%dir %{_docdir}/%{name}-%{ver}-%{rel}/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/AUTHORS +%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT +%doc %{_docdir}/%{name}-%{ver}-%{rel}/EPLICENCE +%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template +%doc %{_docdir}/%{name}-%{ver}-%{rel}/README +%doc %{_docdir}/%{name}-%{ver}-%{rel}/README.md %files appmon %defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ +%{_libdir}/erlang/man/man3/appmon.* %files asn1 %defattr(-,root,root) @@ -763,66 +781,167 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/asn1-*/ebin %{_libdir}/erlang/lib/asn1-*/priv %{_libdir}/erlang/lib/asn1-*/src +%{_libdir}/erlang/man/man3/asn1ct.* +%{_libdir}/erlang/man/man3/asn1rt.* %files common_test %defattr(-,root,root) %{_libdir}/erlang/lib/common_test-*/ +%{_libdir}/erlang/man/man1/run_test.* +%{_libdir}/erlang/man/man3/ct.* +%{_libdir}/erlang/man/man3/ct_cover.* +%{_libdir}/erlang/man/man3/ct_ftp.* +%{_libdir}/erlang/man/man3/ct_master.* +%{_libdir}/erlang/man/man3/ct_rpc.* +%{_libdir}/erlang/man/man3/ct_snmp.* +%{_libdir}/erlang/man/man3/ct_ssh.* +%{_libdir}/erlang/man/man3/ct_telnet.* +%{_libdir}/erlang/man/man3/unix_telnet.* +%{_libdir}/erlang/man/man6/common_test.* %files compiler %defattr(-,root,root) %{_libdir}/erlang/lib/compiler-*/ +%{_libdir}/erlang/man/man3/compile.* %files cosEvent %defattr(-,root,root) %{_libdir}/erlang/lib/cosEvent-*/ +%{_libdir}/erlang/man/man3/cosEventApp.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosEventChannelAdmin_SupplierAdmin.* %files cosEventDomain %defattr(-,root,root) %{_libdir}/erlang/lib/cosEventDomain-*/ +%{_libdir}/erlang/man/man3/CosEventDomainAdmin.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomain.* +%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomainFactory.* +%{_libdir}/erlang/man/man3/cosEventDomainApp.* %files cosFileTransfer %defattr(-,root,root) %{_libdir}/erlang/lib/cosFileTransfer-*/ +%{_libdir}/erlang/man/man3/cosFileTransferApp.* +%{_libdir}/erlang/man/man3/CosFileTransfer_Directory.* +%{_libdir}/erlang/man/man3/CosFileTransfer_File.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileIterator.* +%{_libdir}/erlang/man/man3/CosFileTransfer_FileTransferSession.* +%{_libdir}/erlang/man/man3/CosFileTransfer_VirtualFileSystem.* %files cosNotification %defattr(-,root,root) %{_libdir}/erlang/lib/cosNotification-*/ +%{_libdir}/erlang/man/man3/CosNotification.* +%{_libdir}/erlang/man/man3/CosNotification_AdminPropertiesAdmin.* +%{_libdir}/erlang/man/man3/cosNotificationApp.* +%{_libdir}/erlang/man/man3/CosNotification_QoSAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ConsumerAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannel.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannelFactory.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxySupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* +%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SupplierAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifyPublish.* +%{_libdir}/erlang/man/man3/CosNotifyComm_NotifySubscribe.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_Filter.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterAdmin.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterFactory.* +%{_libdir}/erlang/man/man3/CosNotifyFilter_MappingFilter.* %files cosProperty %defattr(-,root,root) %{_libdir}/erlang/lib/cosProperty-*/ +%{_libdir}/erlang/man/man3/cosProperty.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertiesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertyNamesIterator.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySet.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDef.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDefFactory.* +%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetFactory.* %files cosTime %defattr(-,root,root) %{_libdir}/erlang/lib/cosTime-*/ - -%files cosTransaction +%{_libdir}/erlang/man/man3/cosTime.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventHandler.* +%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventService.* +%{_libdir}/erlang/man/man3/CosTime_TimeService.* +%{_libdir}/erlang/man/man3/CosTime_TIO.* +%{_libdir}/erlang/man/man3/CosTime_UTO.* + +%files cosTransactions %defattr(-,root,root) %{_libdir}/erlang/lib/cosTransactions-*/ +%{_libdir}/erlang/man/man3/cosTransactions.* +%{_libdir}/erlang/man/man3/CosTransactions_Control.* +%{_libdir}/erlang/man/man3/CosTransactions_Coordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_RecoveryCoordinator.* +%{_libdir}/erlang/man/man3/CosTransactions_Resource.* +%{_libdir}/erlang/man/man3/CosTransactions_SubtransactionAwareResource.* +%{_libdir}/erlang/man/man3/CosTransactions_Terminator.* +%{_libdir}/erlang/man/man3/CosTransactions_TransactionFactory.* %files crypto %defattr(-,root,root) %{_libdir}/erlang/lib/crypto-*/ +%{_libdir}/erlang/man/man3/crypto.* +%{_libdir}/erlang/man/man6/crypto.* %files debugger %defattr(-,root,root) %{_libdir}/erlang/lib/debugger-*/ +%{_libdir}/erlang/man/man3/debugger.* +%{_libdir}/erlang/man/man3/i.* +%{_libdir}/erlang/man/man3/int.* %files dialyzer %defattr(-,root,root) %{_libdir}/erlang/lib/dialyzer-*/ +%{_libdir}/erlang/man/man3/dialyzer.* %files doc %defattr(-,root,root) -%doc erlang_doc/* +%doc %{_docdir}/%{name}-%{ver}-%{rel}/doc +%doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/ +%doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/ + %files docbuilder %defattr(-,root,root) %{_libdir}/erlang/lib/docbuilder-*/ +%{_libdir}/erlang/man/man3/docb_gen.* +%{_libdir}/erlang/man/man3/docb_transform.* +%{_libdir}/erlang/man/man3/docb_xml_check.* +%{_libdir}/erlang/man/man6/docbuilder.* %files edoc %defattr(-,root,root) %{_libdir}/erlang/lib/edoc-*/ +%{_libdir}/erlang/man/man3/edoc.* +%{_libdir}/erlang/man/man3/edoc_doclet.* +%{_libdir}/erlang/man/man3/edoc_extract.* +%{_libdir}/erlang/man/man3/edoc_layout.* +%{_libdir}/erlang/man/man3/edoc_lib.* +%{_libdir}/erlang/man/man3/edoc_run.* %files erl_docgen %defattr(-,root,root) @@ -831,19 +950,53 @@ rm -rf $RPM_BUILD_ROOT %files erl_interface %defattr(-,root,root) %{_libdir}/erlang/lib/erl_interface-*/ +%{_libdir}/erlang/man/man1/erl_call.* +%{_libdir}/erlang/man/man3/ei.* +%{_libdir}/erlang/man/man3/ei_connect.* +%{_libdir}/erlang/man/man3/erl_connect.* +%{_libdir}/erlang/man/man3/erl_error.* +%{_libdir}/erlang/man/man3/erl_eterm.* +%{_libdir}/erlang/man/man3/erl_format.* +%{_libdir}/erlang/man/man3/erl_global.* +%{_libdir}/erlang/man/man3/erl_malloc.* +%{_libdir}/erlang/man/man3/erl_marshal.* +%{_libdir}/erlang/man/man3/registry.* %files erts %defattr(-,root,root) -%dir %{_libdir}/erlang + +# TODO these directories should be packaged separately +%dir %{_libdir}/erlang/ +%dir %{_libdir}/erlang/bin/ %dir %{_libdir}/erlang/lib/ +%dir %{_libdir}/erlang/man/ +%dir %{_libdir}/erlang/man/man1/ +%dir %{_libdir}/erlang/man/man3/ +%dir %{_libdir}/erlang/man/man4/ +%dir %{_libdir}/erlang/man/man6/ +%dir %{_libdir}/erlang/man/man7/ +%dir %{_libdir}/erlang/releases/ + %{_bindir}/* %{_libdir}/erlang/bin/ %{_libdir}/erlang/erts-*/ %{_libdir}/erlang/lib/erts-*/ -%{_libdir}/erlang/man/ -%{_libdir}/erlang/releases/ +%{_libdir}/erlang/man/man1/epmd.* +%{_libdir}/erlang/man/man1/erl.* +%{_libdir}/erlang/man/man1/erlc.* +%{_libdir}/erlang/man/man1/escript.* +%{_libdir}/erlang/man/man1/run_erl.* +%{_libdir}/erlang/man/man1/start.* +%{_libdir}/erlang/man/man1/start_erl.* +%{_libdir}/erlang/man/man3/driver_entry.* +%{_libdir}/erlang/man/man3/erl_driver.* +%{_libdir}/erlang/man/man3/erl_prim_loader.* +%{_libdir}/erlang/man/man3/erlang.* +%{_libdir}/erlang/man/man3/erts_alloc.* +%{_libdir}/erlang/man/man3/init.* +%{_libdir}/erlang/man/man3/zlib.* +%{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ -%{_libdir}/erlang/Install %files et %defattr(-,root,root) @@ -851,12 +1004,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/et-*/ebin %{_libdir}/erlang/lib/et-*/include %{_libdir}/erlang/lib/et-*/src +%{_libdir}/erlang/man/man3/et.* +%{_libdir}/erlang/man/man3/et_collector.* +%{_libdir}/erlang/man/man3/et_selector.* +%{_libdir}/erlang/man/man3/et_viewer.* %files eunit %defattr(-,root,root) %dir %{_libdir}/erlang/lib/eunit-*/ %{_libdir}/erlang/lib/eunit-*/ebin %{_libdir}/erlang/lib/eunit-*/include +%{_libdir}/erlang/man/man3/eunit.* +%{_libdir}/erlang/man/man3/eunit_surefire.* %files examples %defattr(-,root,root) @@ -885,6 +1044,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/gs-*/ebin %{_libdir}/erlang/lib/gs-*/priv %{_libdir}/erlang/lib/gs-*/src +%{_libdir}/erlang/man/man3/gs.* %files hipe %defattr(-,root,root) @@ -897,6 +1057,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ic-*/include %{_libdir}/erlang/lib/ic-*/priv %{_libdir}/erlang/lib/ic-*/src +%{_libdir}/erlang/man/man3/ic.* +%{_libdir}/erlang/man/man3/ic_clib.* +%{_libdir}/erlang/man/man3/ic_c_protocol.* %files inets %defattr(-,root,root) @@ -904,10 +1067,28 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/inets-*/ebin %{_libdir}/erlang/lib/inets-*/priv %{_libdir}/erlang/lib/inets-*/src +%{_libdir}/erlang/man/man3/ftp.* +%{_libdir}/erlang/man/man3/httpc.* +%{_libdir}/erlang/man/man3/httpd.* +%{_libdir}/erlang/man/man3/httpd_conf.* +%{_libdir}/erlang/man/man3/httpd_socket.* +%{_libdir}/erlang/man/man3/httpd_util.* +%{_libdir}/erlang/man/man3/inets.* +%{_libdir}/erlang/man/man3/mod_alias.* +%{_libdir}/erlang/man/man3/mod_auth.* +%{_libdir}/erlang/man/man3/mod_esi.* +%{_libdir}/erlang/man/man3/mod_security.* +%{_libdir}/erlang/man/man3/tftp.* %files inviso %defattr(-,root,root) %{_libdir}/erlang/lib/inviso-*/ +%{_libdir}/erlang/man/man3/inviso.* +%{_libdir}/erlang/man/man3/inviso_as_lib.* +%{_libdir}/erlang/man/man3/inviso_lfm.* +%{_libdir}/erlang/man/man3/inviso_lfm_tpfreader.* +%{_libdir}/erlang/man/man3/inviso_rt.* +%{_libdir}/erlang/man/man3/inviso_rt_meta.* %files jinterface %defattr(-,root,root) @@ -919,6 +1100,39 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/kernel-*/ebin %{_libdir}/erlang/lib/kernel-*/include %{_libdir}/erlang/lib/kernel-*/src +%{_libdir}/erlang/man/man3/application.* +%{_libdir}/erlang/man/man3/auth.* +%{_libdir}/erlang/man/man3/code.* +%{_libdir}/erlang/man/man3/disk_log.* +%{_libdir}/erlang/man/man3/erl_boot_server.* +%{_libdir}/erlang/man/man3/erl_ddll.* +%{_libdir}/erlang/man/man3/erl_prim_loader_stub.* +%{_libdir}/erlang/man/man3/erlang_stub.* +%{_libdir}/erlang/man/man3/error_handler.* +%{_libdir}/erlang/man/man3/error_logger.* +%{_libdir}/erlang/man/man3/file.* +%{_libdir}/erlang/man/man3/gen_sctp.* +%{_libdir}/erlang/man/man3/gen_tcp.* +%{_libdir}/erlang/man/man3/gen_udp.* +%{_libdir}/erlang/man/man3/global.* +%{_libdir}/erlang/man/man3/global_group.* +%{_libdir}/erlang/man/man3/heart.* +%{_libdir}/erlang/man/man3/inet.* +%{_libdir}/erlang/man/man3/inet_res.* +%{_libdir}/erlang/man/man3/init_stub.* +%{_libdir}/erlang/man/man3/net_adm.* +%{_libdir}/erlang/man/man3/net_kernel.* +%{_libdir}/erlang/man/man3/os.* +%{_libdir}/erlang/man/man3/packages.* +%{_libdir}/erlang/man/man3/pg2.* +%{_libdir}/erlang/man/man3/rpc.* +%{_libdir}/erlang/man/man3/seq_trace.* +%{_libdir}/erlang/man/man3/user.* +%{_libdir}/erlang/man/man3/wrap_log_reader.* +%{_libdir}/erlang/man/man3/zlib_stub.* +%{_libdir}/erlang/man/man4/app.* +%{_libdir}/erlang/man/man4/config.* +%{_libdir}/erlang/man/man6/kernel.* %files megaco %defattr(-,root,root) @@ -927,6 +1141,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/megaco-*/include %{_libdir}/erlang/lib/megaco-*/priv %{_libdir}/erlang/lib/megaco-*/src +%{_libdir}/erlang/man/man3/megaco.* +%{_libdir}/erlang/man/man3/megaco_codec_meas.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone1.* +%{_libdir}/erlang/man/man3/megaco_codec_mstone2.* +%{_libdir}/erlang/man/man3/megaco_codec_transform.* +%{_libdir}/erlang/man/man3/megaco_edist_compress.* +%{_libdir}/erlang/man/man3/megaco_encoder.* +%{_libdir}/erlang/man/man3/megaco_flex_scanner.* +%{_libdir}/erlang/man/man3/megaco_tcp.* +%{_libdir}/erlang/man/man3/megaco_transport.* +%{_libdir}/erlang/man/man3/megaco_udp.* +%{_libdir}/erlang/man/man3/megaco_user.* %files mnesia %defattr(-,root,root) @@ -934,14 +1160,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/mnesia-*/ebin %{_libdir}/erlang/lib/mnesia-*/include %{_libdir}/erlang/lib/mnesia-*/src +%{_libdir}/erlang/man/man3/mnesia.* +%{_libdir}/erlang/man/man3/mnesia_frag_hash.* +%{_libdir}/erlang/man/man3/mnesia_registry.* %files observer %defattr(-,root,root) %{_libdir}/erlang/lib/observer-*/ +%{_libdir}/erlang/man/man3/crashdump.* +%{_libdir}/erlang/man/man3/ttb.* +%{_libdir}/erlang/man/man6/observer.* %files odbc %defattr(-,root,root) %{_libdir}/erlang/lib/odbc-*/ +%{_libdir}/erlang/man/man3/odbc.* %files orber %defattr(-,root,root) @@ -952,36 +1185,69 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/orber-*/java_src %{_libdir}/erlang/lib/orber-*/priv %{_libdir}/erlang/lib/orber-*/src +%{_libdir}/erlang/man/man3/CosNaming.* +%{_libdir}/erlang/man/man3/CosNaming_BindingIterator.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContext.* +%{_libdir}/erlang/man/man3/CosNaming_NamingContextExt.* +%{_libdir}/erlang/man/man3/Module_Interface.* +%{_libdir}/erlang/man/man3/any.* +%{_libdir}/erlang/man/man3/corba.* +%{_libdir}/erlang/man/man3/corba_object.* +%{_libdir}/erlang/man/man3/etop.* +%{_libdir}/erlang/man/man3/fixed.* +%{_libdir}/erlang/man/man3/interceptors.* +%{_libdir}/erlang/man/man3/lname.* +%{_libdir}/erlang/man/man3/lname_component.* +%{_libdir}/erlang/man/man3/orber.* +%{_libdir}/erlang/man/man3/orber_acl.* +%{_libdir}/erlang/man/man3/orber_diagnostics.* +%{_libdir}/erlang/man/man3/orber_ifr.* +%{_libdir}/erlang/man/man3/orber_tc.* %files os_mon %defattr(-,root,root) %{_libdir}/erlang/lib/os_mon-*/ +%{_libdir}/erlang/man/man3/cpu_sup.* +%{_libdir}/erlang/man/man3/disksup.* +%{_libdir}/erlang/man/man3/memsup.* +%{_libdir}/erlang/man/man3/os_mon_mib.* +%{_libdir}/erlang/man/man3/os_sup.* +%{_libdir}/erlang/man/man6/os_mon.* %files otp_mibs %defattr(-,root,root) %{_libdir}/erlang/lib/otp_mibs-*/ +%{_libdir}/erlang/man/man3/otp_mib.* %files parsetools %defattr(-,root,root) %{_libdir}/erlang/lib/parsetools-*/ +%{_libdir}/erlang/man/man3/leex.* +%{_libdir}/erlang/man/man3/yecc.* %files percept %defattr(-,root,root) %{_libdir}/erlang/lib/percept-*/ +%{_libdir}/erlang/man/man3/egd.* +%{_libdir}/erlang/man/man3/percept.* +%{_libdir}/erlang/man/man3/percept_profile.* %files pman %defattr(-,root,root) %{_libdir}/erlang/lib/pman-*/ +%{_libdir}/erlang/man/man3/pman.* %files public_key %defattr(-,root,root) %{_libdir}/erlang/lib/public_key-*/ +%{_libdir}/erlang/man/man3/public_key.* %files reltool %defattr(-,root,root) %dir %{_libdir}/erlang/lib/reltool-*/ %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src +%{_libdir}/erlang/man/man3/reltool.* %files rpm-macros %defattr(-,root,root) @@ -994,10 +1260,23 @@ rm -rf $RPM_BUILD_ROOT %files runtime_tools %defattr(-,root,root) %{_libdir}/erlang/lib/runtime_tools-*/ +%{_libdir}/erlang/man/man3/dbg.* +%{_libdir}/erlang/man/man3/erts_alloc_config.* +%{_libdir}/erlang/man/man6/runtime_tools.* %files sasl %defattr(-,root,root) %{_libdir}/erlang/lib/sasl-*/ +%{_libdir}/erlang/man/man3/alarm_handler.* +%{_libdir}/erlang/man/man3/overload.* +%{_libdir}/erlang/man/man3/rb.* +%{_libdir}/erlang/man/man3/release_handler.* +%{_libdir}/erlang/man/man3/systools.* +%{_libdir}/erlang/man/man4/appup.* +%{_libdir}/erlang/man/man4/rel.* +%{_libdir}/erlang/man/man4/relup.* +%{_libdir}/erlang/man/man4/script.* +%{_libdir}/erlang/man/man6/sasl.* %files snmp %defattr(-,root,root) @@ -1007,10 +1286,62 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/snmp-*/mibs %{_libdir}/erlang/lib/snmp-*/priv %{_libdir}/erlang/lib/snmp-*/src +%{_libdir}/erlang/man/man3/snmp.* +%{_libdir}/erlang/man/man3/snmpa.* +%{_libdir}/erlang/man/man3/snmpa_conf.* +%{_libdir}/erlang/man/man3/snmpa_discovery_handler.* +%{_libdir}/erlang/man/man3/snmpa_error.* +%{_libdir}/erlang/man/man3/snmpa_error_io.* +%{_libdir}/erlang/man/man3/snmpa_error_logger.* +%{_libdir}/erlang/man/man3/snmpa_error_report.* +%{_libdir}/erlang/man/man3/snmpa_local_db.* +%{_libdir}/erlang/man/man3/snmpa_mpd.* +%{_libdir}/erlang/man/man3/snmpa_network_interface.* +%{_libdir}/erlang/man/man3/snmpa_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpa_notification_delivery_info_receiver.* +%{_libdir}/erlang/man/man3/snmpa_notification_filter.* +%{_libdir}/erlang/man/man3/snmpa_supervisor.* +%{_libdir}/erlang/man/man3/snmpc.* +%{_libdir}/erlang/man/man3/snmp_community_mib.* +%{_libdir}/erlang/man/man3/snmp_framework_mib.* +%{_libdir}/erlang/man/man3/snmp_generic.* +%{_libdir}/erlang/man/man3/snmp_index.* +%{_libdir}/erlang/man/man3/snmpm.* +%{_libdir}/erlang/man/man3/snmpm_conf.* +%{_libdir}/erlang/man/man3/snmpm_mpd.* +%{_libdir}/erlang/man/man3/snmpm_network_interface.* +%{_libdir}/erlang/man/man3/snmpm_network_interface_filter.* +%{_libdir}/erlang/man/man3/snmpm_user.* +%{_libdir}/erlang/man/man3/snmp_notification_mib.* +%{_libdir}/erlang/man/man3/snmp_pdus.* +%{_libdir}/erlang/man/man3/snmp_standard_mib.* +%{_libdir}/erlang/man/man3/snmp_target_mib.* +%{_libdir}/erlang/man/man3/snmp_user_based_sm_mib.* +%{_libdir}/erlang/man/man3/snmp_view_based_acm_mib.* +%{_libdir}/erlang/man/man6/snmp.* +%{_libdir}/erlang/man/man7/INET-ADDRESS-MIB.* +%{_libdir}/erlang/man/man7/OTP-SNMPEA-MIB.* +%{_libdir}/erlang/man/man7/RFC1213-MIB.* +%{_libdir}/erlang/man/man7/SNMP-COMMUNITY-MIB.* +%{_libdir}/erlang/man/man7/SNMP-FRAMEWORK-MIB.* +%{_libdir}/erlang/man/man7/SNMP-MPD-MIB.* +%{_libdir}/erlang/man/man7/SNMP-NOTIFICATION-MIB.* +%{_libdir}/erlang/man/man7/SNMP-TARGET-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USER-BASED-SM-MIB.* +%{_libdir}/erlang/man/man7/SNMP-USM-AES-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-MIB.* +%{_libdir}/erlang/man/man7/SNMPv2-TM.* +%{_libdir}/erlang/man/man7/SNMP-VIEW-BASED-ACM-MIB.* +%{_libdir}/erlang/man/man7/STANDARD-MIB.* %files ssh %defattr(-,root,root) %{_libdir}/erlang/lib/ssh-*/ +%{_libdir}/erlang/man/man3/ssh.* +%{_libdir}/erlang/man/man3/ssh_channel.* +%{_libdir}/erlang/man/man3/ssh_connection.* +%{_libdir}/erlang/man/man3/ssh_sftp.* +%{_libdir}/erlang/man/man3/ssh_sftpd.* %files ssl %defattr(-,root,root) @@ -1020,6 +1351,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ssl-*/pkix %{_libdir}/erlang/lib/ssl-*/priv %{_libdir}/erlang/lib/ssl-*/src +%{_libdir}/erlang/man/man3/new_ssl.* +%{_libdir}/erlang/man/man3/ssl.* +%{_libdir}/erlang/man/man6/ssl.* %files stdlib %defattr(-,root,root) @@ -1027,19 +1361,91 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/stdlib-*/ebin %{_libdir}/erlang/lib/stdlib-*/include %{_libdir}/erlang/lib/stdlib-*/src +%{_libdir}/erlang/man/man3/array.* +%{_libdir}/erlang/man/man3/base64.* +%{_libdir}/erlang/man/man3/beam_lib.* +%{_libdir}/erlang/man/man3/c.* +%{_libdir}/erlang/man/man3/calendar.* +%{_libdir}/erlang/man/man3/dets.* +%{_libdir}/erlang/man/man3/dict.* +%{_libdir}/erlang/man/man3/digraph.* +%{_libdir}/erlang/man/man3/digraph_utils.* +%{_libdir}/erlang/man/man3/epp.* +%{_libdir}/erlang/man/man3/erl_eval.* +%{_libdir}/erlang/man/man3/erl_expand_records.* +%{_libdir}/erlang/man/man3/erl_id_trans.* +%{_libdir}/erlang/man/man3/erl_internal.* +%{_libdir}/erlang/man/man3/erl_lint.* +%{_libdir}/erlang/man/man3/erl_parse.* +%{_libdir}/erlang/man/man3/erl_pp.* +%{_libdir}/erlang/man/man3/erl_scan.* +%{_libdir}/erlang/man/man3/erl_tar.* +%{_libdir}/erlang/man/man3/ets.* +%{_libdir}/erlang/man/man3/file_sorter.* +%{_libdir}/erlang/man/man3/filelib.* +%{_libdir}/erlang/man/man3/filename.* +%{_libdir}/erlang/man/man3/gb_sets.* +%{_libdir}/erlang/man/man3/gb_trees.* +%{_libdir}/erlang/man/man3/gen_event.* +%{_libdir}/erlang/man/man3/gen_fsm.* +%{_libdir}/erlang/man/man3/gen_server.* +%{_libdir}/erlang/man/man3/io.* +%{_libdir}/erlang/man/man3/io_lib.* +%{_libdir}/erlang/man/man3/lib.* +%{_libdir}/erlang/man/man3/lists.* +%{_libdir}/erlang/man/man3/log_mf_h.* +%{_libdir}/erlang/man/man3/math.* +%{_libdir}/erlang/man/man3/ms_transform.* +%{_libdir}/erlang/man/man3/orddict.* +%{_libdir}/erlang/man/man3/ordsets.* +%{_libdir}/erlang/man/man3/pg.* +%{_libdir}/erlang/man/man3/pool.* +%{_libdir}/erlang/man/man3/proc_lib.* +%{_libdir}/erlang/man/man3/proplists.* +%{_libdir}/erlang/man/man3/qlc.* +%{_libdir}/erlang/man/man3/queue.* +%{_libdir}/erlang/man/man3/random.* +%{_libdir}/erlang/man/man3/re.* +%{_libdir}/erlang/man/man3/regexp.* +%{_libdir}/erlang/man/man3/sets.* +%{_libdir}/erlang/man/man3/shell.* +%{_libdir}/erlang/man/man3/shell_default.* +%{_libdir}/erlang/man/man3/slave.* +%{_libdir}/erlang/man/man3/sofs.* +%{_libdir}/erlang/man/man3/string.* +%{_libdir}/erlang/man/man3/supervisor.* +%{_libdir}/erlang/man/man3/supervisor_bridge.* +%{_libdir}/erlang/man/man3/sys.* +%{_libdir}/erlang/man/man3/timer.* +%{_libdir}/erlang/man/man3/unicode.* +%{_libdir}/erlang/man/man3/zip.* +%{_libdir}/erlang/man/man6/stdlib.* %files syntax_tools %defattr(-,root,root) %dir %{_libdir}/erlang/lib/syntax_tools-*/ %{_libdir}/erlang/lib/syntax_tools-*/ebin +%{_libdir}/erlang/man/man3/epp_dodger.* +%{_libdir}/erlang/man/man3/erl_comment_scan.* +%{_libdir}/erlang/man/man3/erl_prettypr.* +%{_libdir}/erlang/man/man3/erl_recomment.* +%{_libdir}/erlang/man/man3/erl_syntax.* +%{_libdir}/erlang/man/man3/erl_syntax_lib.* +%{_libdir}/erlang/man/man3/erl_tidy.* +%{_libdir}/erlang/man/man3/igor.* +%{_libdir}/erlang/man/man3/prettypr.* %files test_server %defattr(-,root,root) %{_libdir}/erlang/lib/test_server-*/ +%{_libdir}/erlang/man/man3/test_server.* +%{_libdir}/erlang/man/man3/test_server_ctrl.* +%{_libdir}/erlang/man/man6/test_server.* %files toolbar %defattr(-,root,root) %{_libdir}/erlang/lib/toolbar-*/ +%{_libdir}/erlang/man/man3/toolbar.* %files tools %defattr(-,root,root) @@ -1049,10 +1455,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/priv %{_libdir}/erlang/lib/tools-*/src +%{_libdir}/erlang/man/man3/cover.* +%{_libdir}/erlang/man/man3/cprof.* +%{_libdir}/erlang/man/man3/eprof.* +%{_libdir}/erlang/man/man3/erlang_mode.* +%{_libdir}/erlang/man/man3/fprof.* +%{_libdir}/erlang/man/man3/instrument.* +%{_libdir}/erlang/man/man3/lcnt.* +%{_libdir}/erlang/man/man3/make.* +%{_libdir}/erlang/man/man3/tags.* +%{_libdir}/erlang/man/man3/xref.* %files tv %defattr(-,root,root) %{_libdir}/erlang/lib/tv-*/ +%{_libdir}/erlang/man/man3/tv.* %files typer %defattr(-,root,root) @@ -1061,6 +1478,8 @@ rm -rf $RPM_BUILD_ROOT %files webtool %defattr(-,root,root) %{_libdir}/erlang/lib/webtool-*/ +%{_libdir}/erlang/man/man1/start_webtool.* +%{_libdir}/erlang/man/man3/webtool.* %files wx %defattr(-,root,root) @@ -1069,17 +1488,249 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/wx-*/include %{_libdir}/erlang/lib/wx-*/priv %{_libdir}/erlang/lib/wx-*/src +%{_libdir}/erlang/man/man3/gl.* +%{_libdir}/erlang/man/man3/glu.* +%{_libdir}/erlang/man/man3/wx.* +%{_libdir}/erlang/man/man3/wx_misc.* +%{_libdir}/erlang/man/man3/wx_object.* +%{_libdir}/erlang/man/man3/wxAcceleratorEntry.* +%{_libdir}/erlang/man/man3/wxAcceleratorTable.* +%{_libdir}/erlang/man/man3/wxArtProvider.* +%{_libdir}/erlang/man/man3/wxAuiDockArt.* +%{_libdir}/erlang/man/man3/wxAuiManager.* +%{_libdir}/erlang/man/man3/wxAuiManagerEvent.* +%{_libdir}/erlang/man/man3/wxAuiNotebook.* +%{_libdir}/erlang/man/man3/wxAuiNotebookEvent.* +%{_libdir}/erlang/man/man3/wxAuiPaneInfo.* +%{_libdir}/erlang/man/man3/wxAuiTabArt.* +%{_libdir}/erlang/man/man3/wxBitmap.* +%{_libdir}/erlang/man/man3/wxBitmapButton.* +%{_libdir}/erlang/man/man3/wxBitmapDataObject.* +%{_libdir}/erlang/man/man3/wxBoxSizer.* +%{_libdir}/erlang/man/man3/wxBrush.* +%{_libdir}/erlang/man/man3/wxBufferedDC.* +%{_libdir}/erlang/man/man3/wxBufferedPaintDC.* +%{_libdir}/erlang/man/man3/wxButton.* +%{_libdir}/erlang/man/man3/wxCalendarCtrl.* +%{_libdir}/erlang/man/man3/wxCalendarDateAttr.* +%{_libdir}/erlang/man/man3/wxCalendarEvent.* +%{_libdir}/erlang/man/man3/wxCaret.* +%{_libdir}/erlang/man/man3/wxCheckBox.* +%{_libdir}/erlang/man/man3/wxCheckListBox.* +%{_libdir}/erlang/man/man3/wxChildFocusEvent.* +%{_libdir}/erlang/man/man3/wxChoice.* +%{_libdir}/erlang/man/man3/wxChoicebook.* +%{_libdir}/erlang/man/man3/wxClientDC.* +%{_libdir}/erlang/man/man3/wxClipboard.* +%{_libdir}/erlang/man/man3/wxCloseEvent.* +%{_libdir}/erlang/man/man3/wxColourData.* +%{_libdir}/erlang/man/man3/wxColourDialog.* +%{_libdir}/erlang/man/man3/wxColourPickerCtrl.* +%{_libdir}/erlang/man/man3/wxColourPickerEvent.* +%{_libdir}/erlang/man/man3/wxComboBox.* +%{_libdir}/erlang/man/man3/wxCommandEvent.* +%{_libdir}/erlang/man/man3/wxContextMenuEvent.* +%{_libdir}/erlang/man/man3/wxControl.* +%{_libdir}/erlang/man/man3/wxControlWithItems.* +%{_libdir}/erlang/man/man3/wxCursor.* +%{_libdir}/erlang/man/man3/wxDataObject.* +%{_libdir}/erlang/man/man3/wxDateEvent.* +%{_libdir}/erlang/man/man3/wxDatePickerCtrl.* +%{_libdir}/erlang/man/man3/wxDC.* +%{_libdir}/erlang/man/man3/wxDialog.* +%{_libdir}/erlang/man/man3/wxDirDialog.* +%{_libdir}/erlang/man/man3/wxDirPickerCtrl.* +%{_libdir}/erlang/man/man3/wxDisplayChangedEvent.* +%{_libdir}/erlang/man/man3/wxEraseEvent.* +%{_libdir}/erlang/man/man3/wxEvent.* +%{_libdir}/erlang/man/man3/wxEvtHandler.* +%{_libdir}/erlang/man/man3/wxFileDataObject.* +%{_libdir}/erlang/man/man3/wxFileDialog.* +%{_libdir}/erlang/man/man3/wxFileDirPickerEvent.* +%{_libdir}/erlang/man/man3/wxFilePickerCtrl.* +%{_libdir}/erlang/man/man3/wxFindReplaceData.* +%{_libdir}/erlang/man/man3/wxFindReplaceDialog.* +%{_libdir}/erlang/man/man3/wxFlexGridSizer.* +%{_libdir}/erlang/man/man3/wxFocusEvent.* +%{_libdir}/erlang/man/man3/wxFont.* +%{_libdir}/erlang/man/man3/wxFontData.* +%{_libdir}/erlang/man/man3/wxFontDialog.* +%{_libdir}/erlang/man/man3/wxFontPickerCtrl.* +%{_libdir}/erlang/man/man3/wxFontPickerEvent.* +%{_libdir}/erlang/man/man3/wxFrame.* +%{_libdir}/erlang/man/man3/wxGauge.* +%{_libdir}/erlang/man/man3/wxGBSizerItem.* +%{_libdir}/erlang/man/man3/wxGenericDirCtrl.* +%{_libdir}/erlang/man/man3/wxGLCanvas.* +%{_libdir}/erlang/man/man3/wxGraphicsBrush.* +%{_libdir}/erlang/man/man3/wxGraphicsContext.* +%{_libdir}/erlang/man/man3/wxGraphicsFont.* +%{_libdir}/erlang/man/man3/wxGraphicsMatrix.* +%{_libdir}/erlang/man/man3/wxGraphicsObject.* +%{_libdir}/erlang/man/man3/wxGraphicsPath.* +%{_libdir}/erlang/man/man3/wxGraphicsPen.* +%{_libdir}/erlang/man/man3/wxGraphicsRenderer.* +%{_libdir}/erlang/man/man3/wxGrid.* +%{_libdir}/erlang/man/man3/wxGridBagSizer.* +%{_libdir}/erlang/man/man3/wxGridCellAttr.* +%{_libdir}/erlang/man/man3/wxGridCellBoolEditor.* +%{_libdir}/erlang/man/man3/wxGridCellBoolRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellChoiceEditor.* +%{_libdir}/erlang/man/man3/wxGridCellEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatEditor.* +%{_libdir}/erlang/man/man3/wxGridCellFloatRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellNumberEditor.* +%{_libdir}/erlang/man/man3/wxGridCellNumberRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellStringRenderer.* +%{_libdir}/erlang/man/man3/wxGridCellTextEditor.* +%{_libdir}/erlang/man/man3/wxGridEvent.* +%{_libdir}/erlang/man/man3/wxGridSizer.* +%{_libdir}/erlang/man/man3/wxHelpEvent.* +%{_libdir}/erlang/man/man3/wxHtmlEasyPrinting.* +%{_libdir}/erlang/man/man3/wxHtmlLinkEvent.* +%{_libdir}/erlang/man/man3/wxHtmlWindow.* +%{_libdir}/erlang/man/man3/wxIcon.* +%{_libdir}/erlang/man/man3/wxIconBundle.* +%{_libdir}/erlang/man/man3/wxIconizeEvent.* +%{_libdir}/erlang/man/man3/wxIdleEvent.* +%{_libdir}/erlang/man/man3/wxImage.* +%{_libdir}/erlang/man/man3/wxImageList.* +%{_libdir}/erlang/man/man3/wxJoystickEvent.* +%{_libdir}/erlang/man/man3/wxKeyEvent.* +%{_libdir}/erlang/man/man3/wxLayoutAlgorithm.* +%{_libdir}/erlang/man/man3/wxListbook.* +%{_libdir}/erlang/man/man3/wxListBox.* +%{_libdir}/erlang/man/man3/wxListCtrl.* +%{_libdir}/erlang/man/man3/wxListEvent.* +%{_libdir}/erlang/man/man3/wxListItem.* +%{_libdir}/erlang/man/man3/wxListView.* +%{_libdir}/erlang/man/man3/wxLogNull.* +%{_libdir}/erlang/man/man3/wxMask.* +%{_libdir}/erlang/man/man3/wxMaximizeEvent.* +%{_libdir}/erlang/man/man3/wxMDIChildFrame.* +%{_libdir}/erlang/man/man3/wxMDIClientWindow.* +%{_libdir}/erlang/man/man3/wxMDIParentFrame.* +%{_libdir}/erlang/man/man3/wxMemoryDC.* +%{_libdir}/erlang/man/man3/wxMenu.* +%{_libdir}/erlang/man/man3/wxMenuBar.* +%{_libdir}/erlang/man/man3/wxMenuEvent.* +%{_libdir}/erlang/man/man3/wxMenuItem.* +%{_libdir}/erlang/man/man3/wxMessageDialog.* +%{_libdir}/erlang/man/man3/wxMiniFrame.* +%{_libdir}/erlang/man/man3/wxMirrorDC.* +%{_libdir}/erlang/man/man3/wxMouseCaptureChangedEvent.* +%{_libdir}/erlang/man/man3/wxMouseEvent.* +%{_libdir}/erlang/man/man3/wxMoveEvent.* +%{_libdir}/erlang/man/man3/wxMultiChoiceDialog.* +%{_libdir}/erlang/man/man3/wxNavigationKeyEvent.* +%{_libdir}/erlang/man/man3/wxNcPaintEvent.* +%{_libdir}/erlang/man/man3/wxNotebook.* +%{_libdir}/erlang/man/man3/wxNotebookEvent.* +%{_libdir}/erlang/man/man3/wxNotifyEvent.* +%{_libdir}/erlang/man/man3/wxPageSetupDialog.* +%{_libdir}/erlang/man/man3/wxPageSetupDialogData.* +%{_libdir}/erlang/man/man3/wxPaintDC.* +%{_libdir}/erlang/man/man3/wxPaintEvent.* +%{_libdir}/erlang/man/man3/wxPalette.* +%{_libdir}/erlang/man/man3/wxPaletteChangedEvent.* +%{_libdir}/erlang/man/man3/wxPanel.* +%{_libdir}/erlang/man/man3/wxPasswordEntryDialog.* +%{_libdir}/erlang/man/man3/wxPen.* +%{_libdir}/erlang/man/man3/wxPickerBase.* +%{_libdir}/erlang/man/man3/wxPostScriptDC.* +%{_libdir}/erlang/man/man3/wxPreviewCanvas.* +%{_libdir}/erlang/man/man3/wxPreviewControlBar.* +%{_libdir}/erlang/man/man3/wxPreviewFrame.* +%{_libdir}/erlang/man/man3/wxPrintData.* +%{_libdir}/erlang/man/man3/wxPrintDialog.* +%{_libdir}/erlang/man/man3/wxPrintDialogData.* +%{_libdir}/erlang/man/man3/wxPrinter.* +%{_libdir}/erlang/man/man3/wxPrintout.* +%{_libdir}/erlang/man/man3/wxPrintPreview.* +%{_libdir}/erlang/man/man3/wxProgressDialog.* +%{_libdir}/erlang/man/man3/wxQueryNewPaletteEvent.* +%{_libdir}/erlang/man/man3/wxRadioBox.* +%{_libdir}/erlang/man/man3/wxRadioButton.* +%{_libdir}/erlang/man/man3/wxRegion.* +%{_libdir}/erlang/man/man3/wxSashEvent.* +%{_libdir}/erlang/man/man3/wxSashLayoutWindow.* +%{_libdir}/erlang/man/man3/wxSashWindow.* +%{_libdir}/erlang/man/man3/wxScreenDC.* +%{_libdir}/erlang/man/man3/wxScrollBar.* +%{_libdir}/erlang/man/man3/wxScrolledWindow.* +%{_libdir}/erlang/man/man3/wxScrollEvent.* +%{_libdir}/erlang/man/man3/wxScrollWinEvent.* +%{_libdir}/erlang/man/man3/wxSetCursorEvent.* +%{_libdir}/erlang/man/man3/wxShowEvent.* +%{_libdir}/erlang/man/man3/wxSingleChoiceDialog.* +%{_libdir}/erlang/man/man3/wxSizeEvent.* +%{_libdir}/erlang/man/man3/wxSizer.* +%{_libdir}/erlang/man/man3/wxSizerFlags.* +%{_libdir}/erlang/man/man3/wxSizerItem.* +%{_libdir}/erlang/man/man3/wxSlider.* +%{_libdir}/erlang/man/man3/wxSpinButton.* +%{_libdir}/erlang/man/man3/wxSpinCtrl.* +%{_libdir}/erlang/man/man3/wxSpinEvent.* +%{_libdir}/erlang/man/man3/wxSplashScreen.* +%{_libdir}/erlang/man/man3/wxSplitterEvent.* +%{_libdir}/erlang/man/man3/wxSplitterWindow.* +%{_libdir}/erlang/man/man3/wxStaticBitmap.* +%{_libdir}/erlang/man/man3/wxStaticBox.* +%{_libdir}/erlang/man/man3/wxStaticBoxSizer.* +%{_libdir}/erlang/man/man3/wxStaticLine.* +%{_libdir}/erlang/man/man3/wxStaticText.* +%{_libdir}/erlang/man/man3/wxStatusBar.* +%{_libdir}/erlang/man/man3/wxStdDialogButtonSizer.* +%{_libdir}/erlang/man/man3/wxStyledTextCtrl.* +%{_libdir}/erlang/man/man3/wxStyledTextEvent.* +%{_libdir}/erlang/man/man3/wxSysColourChangedEvent.* +%{_libdir}/erlang/man/man3/wxTextAttr.* +%{_libdir}/erlang/man/man3/wxTextCtrl.* +%{_libdir}/erlang/man/man3/wxTextDataObject.* +%{_libdir}/erlang/man/man3/wxTextEntryDialog.* +%{_libdir}/erlang/man/man3/wxToggleButton.* +%{_libdir}/erlang/man/man3/wxToolBar.* +%{_libdir}/erlang/man/man3/wxToolbook.* +%{_libdir}/erlang/man/man3/wxToolTip.* +%{_libdir}/erlang/man/man3/wxTopLevelWindow.* +%{_libdir}/erlang/man/man3/wxTreebook.* +%{_libdir}/erlang/man/man3/wxTreeCtrl.* +%{_libdir}/erlang/man/man3/wxTreeEvent.* +%{_libdir}/erlang/man/man3/wxUpdateUIEvent.* +%{_libdir}/erlang/man/man3/wxWindow.* +%{_libdir}/erlang/man/man3/wxWindowCreateEvent.* +%{_libdir}/erlang/man/man3/wxWindowDC.* +%{_libdir}/erlang/man/man3/wxWindowDestroyEvent.* +%{_libdir}/erlang/man/man3/wxXmlResource.* %files xmerl %defattr(-,root,root) %{_libdir}/erlang/lib/xmerl-*/ +%{_libdir}/erlang/man/man3/xmerl.* +%{_libdir}/erlang/man/man3/xmerl_eventp.* +%{_libdir}/erlang/man/man3/xmerl_sax_parser.* +%{_libdir}/erlang/man/man3/xmerl_scan.* +%{_libdir}/erlang/man/man3/xmerl_xpath.* +%{_libdir}/erlang/man/man3/xmerl_xs.* +%{_libdir}/erlang/man/man3/xmerl_xsd.* -%post -%{_libdir}/erlang/Install -minimal -cross %{_libdir}/erlang >/dev/null 2>/dev/null +%changelog +* Wed Apr 28 2010 Peter Lemenkov - R13B-04.9 +- Added missing files, necessary for emacs (see rhbz #585349) +- Patches rebased +* Tue Apr 27 2010 Peter Lemenkov - R13B-04.8 +- Added missing BuildRequires libxslt (for building docs) +- Removed %%post script completely (resolves rhbz #586428) +- Since now both docs and man-pages are built from sources +- No need to manually create symlinks in %%{_bindir} + +* Mon Apr 26 2010 Peter Lemenkov - R13B-04.7 +- Build with erlang-rpm-macros +- Man-files are packed with packages, they belong to -%changelog * Mon Apr 26 2010 Peter Lemenkov - R13B-04.6 - Made erlang-rpm-macros as separate package - Fix error while installing erlang-rpm-macros diff --git a/import.log b/import.log index 97016fb..69b579b 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 +erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch index 5f9594f..632408b 100644 --- a/otp-0001-Do-not-format-man-pages.patch +++ b/otp-0001-Do-not-format-man-pages.patch @@ -1,7 +1,7 @@ From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:45:28 +0300 -Subject: [PATCH 1/9] Do not format man-pages +Subject: [PATCH 1/7] Do not format man-pages Signed-off-by: Peter Lemenkov --- diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 0293073..1da9a67 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -1,7 +1,7 @@ From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH 2/9] Remove rpath +Subject: [PATCH 2/7] Remove rpath Signed-off-by: Peter Lemenkov --- diff --git a/otp-0004-Fix-shared-libraries-installation.patch b/otp-0004-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..f828169 --- /dev/null +++ b/otp-0004-Fix-shared-libraries-installation.patch @@ -0,0 +1,58 @@ +From edaced375235a006c87a3e15b8b17e9bc6dbb923 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 15 Apr 2010 13:31:36 +0400 +Subject: [PATCH 4/7] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files +previously. + +Signed-off-by: Peter Lemenkov +--- + lib/asn1/c_src/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/wx/c_src/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 906c513..9e9cb18 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 6ce9b34..5af651d 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -280,7 +280,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in +index 5a0b4ce..8710641 100644 +--- a/lib/wx/c_src/Makefile.in ++++ b/lib/wx/c_src/Makefile.in +@@ -167,7 +167,7 @@ release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) + $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ + $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ +- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) ++ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) + + release_docs_spec: + +-- +1.6.6.1 + diff --git a/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch new file mode 100644 index 0000000..4f55214 --- /dev/null +++ b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch @@ -0,0 +1,35 @@ +From 3475d4f155dc4bc2919e371e614fee81f01e87d5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 16 Apr 2010 21:13:47 +0400 +Subject: [PATCH 5/7] Fix for dlopening libGL and libGLU + +Signed-off-by: Peter Lemenkov +--- + lib/wx/c_src/wxe_gl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp +index 63dd68f..36bf15f 100644 +--- a/lib/wx/c_src/wxe_gl.cpp ++++ b/lib/wx/c_src/wxe_gl.cpp +@@ -81,7 +81,7 @@ int initOpenGL() + WCHAR * DLName = wxT("opengl32.dll"); + HMODULE LIBhandle = LoadLibrary(DLName); + #else +- char * DLName = (char *) "libGL.so"; ++ char * DLName = (char *) "libGL.so.1"; + void * LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +@@ -132,7 +132,7 @@ int initOpenGL() + DLName = wxT("glu32.dll"); + LIBhandle = LoadLibrary(DLName); + #else +- DLName = (char *) "libGLU.so"; ++ DLName = (char *) "libGLU.so.1"; + LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +-- +1.6.6.1 + diff --git a/otp-0006-Fix-check-for-compile-workspace-overflow.patch b/otp-0006-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..37363de --- /dev/null +++ b/otp-0006-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From 400034faee44b65a5e33014e7ce4edcfcfba870f Mon Sep 17 00:00:00 2001 +From: Michael Santos +Date: Thu, 18 Mar 2010 20:08:10 -0400 +Subject: [PATCH 6/7] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 2974336..9508c5a 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2445,7 +2450,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2494,7 +2499,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + diff --git a/otp-0006-Fix-shared-libraries-installation.patch b/otp-0006-Fix-shared-libraries-installation.patch deleted file mode 100644 index 2df3cb4..0000000 --- a/otp-0006-Fix-shared-libraries-installation.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 15 Apr 2010 13:31:36 +0400 -Subject: [PATCH 6/9] Fix shared libraries installation - -Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, -megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files -previously. - -Signed-off-by: Peter Lemenkov ---- - lib/asn1/c_src/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 2 +- - lib/wx/c_src/Makefile.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 906c513..9e9cb18 100644 ---- a/lib/asn1/c_src/Makefile -+++ b/lib/asn1/c_src/Makefile -@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/lib -- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib -+ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib - $(INSTALL_DIR) $(RELSYSDIR)/c_src - $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src - -diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 6ce9b34..5af651d 100644 ---- a/lib/megaco/src/flex/Makefile.in -+++ b/lib/megaco/src/flex/Makefile.in -@@ -280,7 +280,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) - $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex -- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib -+ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib - endif - - -diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in -index 5a0b4ce..8710641 100644 ---- a/lib/wx/c_src/Makefile.in -+++ b/lib/wx/c_src/Makefile.in -@@ -167,7 +167,7 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) - $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ - $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ -- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) -+ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) - - release_docs_spec: - --- -1.6.6.1 - diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch deleted file mode 100644 index 5e78c4a..0000000 --- a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 16 Apr 2010 21:13:47 +0400 -Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU - -Signed-off-by: Peter Lemenkov ---- - lib/wx/c_src/wxe_gl.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp -index 63dd68f..36bf15f 100644 ---- a/lib/wx/c_src/wxe_gl.cpp -+++ b/lib/wx/c_src/wxe_gl.cpp -@@ -81,7 +81,7 @@ int initOpenGL() - WCHAR * DLName = wxT("opengl32.dll"); - HMODULE LIBhandle = LoadLibrary(DLName); - #else -- char * DLName = (char *) "libGL.so"; -+ char * DLName = (char *) "libGL.so.1"; - void * LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); -@@ -132,7 +132,7 @@ int initOpenGL() - DLName = wxT("glu32.dll"); - LIBhandle = LoadLibrary(DLName); - #else -- DLName = (char *) "libGLU.so"; -+ DLName = (char *) "libGLU.so.1"; - LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); --- -1.6.6.1 - diff --git a/otp-0007-Install-missing-emacs-files.patch b/otp-0007-Install-missing-emacs-files.patch new file mode 100644 index 0000000..389c517 --- /dev/null +++ b/otp-0007-Install-missing-emacs-files.patch @@ -0,0 +1,28 @@ +From 09e0f9ec22f680c759feea2e90913128ce2a249d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 28 Apr 2010 14:35:59 +0400 +Subject: [PATCH 7/7] Install missing emacs files + +Signed-off-by: Peter Lemenkov +--- + lib/tools/emacs/Makefile | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile +index 7249263..17978de 100644 +--- a/lib/tools/emacs/Makefile ++++ b/lib/tools/emacs/Makefile +@@ -38,7 +38,10 @@ MAN_FILES= \ + + EMACS_FILES= \ + erlang-start \ ++ erlang-skels-old \ ++ erlang-skels \ + erlang-eunit \ ++ erlang_appwiz \ + erlang + + README_FILES= README +-- +1.6.6.1 + diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0008-Fix-check-for-compile-workspace-overflow.patch deleted file mode 100644 index 2e34451..0000000 --- a/otp-0008-Fix-check-for-compile-workspace-overflow.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001 -From: Michael Santos -Date: Thu, 18 Mar 2010 20:08:10 -0400 -Subject: [PATCH 8/9] Fix check for compile workspace overflow - -Patch from: -http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch - -Test case: -N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). - -Compiling large regular expressions could overflow the workspace -buffer. Modify the test to check for a value smaller than the buffer -size. ---- - erts/emulator/pcre/pcre_compile.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c -index 2974336..9508c5a 100644 ---- a/erts/emulator/pcre/pcre_compile.c -+++ b/erts/emulator/pcre/pcre_compile.c -@@ -92,6 +92,11 @@ is 4 there is plenty of room. */ - - #define COMPILE_WORK_SIZE (4096) - -+/* The overrun tests check for a slightly smaller size so that they detect the -+overrun before it actually does run off the end of the data block. */ -+ -+#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) -+ - - /* Table for handling escaped characters in the range '0'-'z'. Positive returns - are simple data values; negative values are for special things like \d and so -@@ -2445,7 +2450,7 @@ for (;; ptr++) - #ifdef DEBUG - if (code > cd->hwm) cd->hwm = code; /* High water info */ - #endif -- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ -+ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ - { - *errorcodeptr = ERR52; - goto FAILED; -@@ -2494,7 +2499,7 @@ for (;; ptr++) - /* In the real compile phase, just check the workspace used by the forward - reference list. */ - -- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) -+ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) - { - *errorcodeptr = ERR52; - goto FAILED; --- -1.6.6.1 - diff --git a/sources b/sources index 9207cc0..2216c4f 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -d69ce51bfabbdd0808461d86dfc95689 otp_doc_html_R13B04.tar.gz -681aaef70affc64743f4e8c0675034af otp_doc_man_R13B04.tar.gz ca6da4921e438891967900aa6a084341 otp_src_R13B04.tar.gz -- cgit From 80ff2026639e16e5921c0f9aaf4cc256bc062f1b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 6 May 2010 07:36:45 +0000 Subject: Disabled autoimatic adding of requires/provides --- erlang.spec | 317 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 263 insertions(+), 54 deletions(-) diff --git a/erlang.spec b/erlang.spec index c59a8ce..991efac 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,11 +1,9 @@ -%{?__erlang_provides_requires: %{__erlang_provides_requires}} - %define ver R13B %define rel 04 Name: erlang Version: %{ver} -Release: %{rel}.9%{?dist} +Release: %{rel}.10%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -110,7 +108,11 @@ systems from Ericsson. %package appmon Summary: A utility used to supervise Applications executing on several Erlang nodes Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description appmon @@ -119,7 +121,10 @@ A utility used to supervise Applications executing on several Erlang nodes. %package asn1 Summary: Provides support for Abstract Syntax Notation One Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description asn1 @@ -128,7 +133,19 @@ Provides support for Abstract Syntax Notation One. %package common_test Summary: A portable framework for automatic testing Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-debugger = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-ssh = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-test_server = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description common_test @@ -137,7 +154,11 @@ A portable framework for automatic testing. %package compiler Summary: A byte code compiler for Erlang which produces highly compact code Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description compiler @@ -146,7 +167,10 @@ A byte code compiler for Erlang which produces highly compact code. %package cosEvent Summary: Orber OMG Event Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosEvent @@ -155,7 +179,11 @@ Orber OMG Event Service. %package cosEventDomain Summary: Orber OMG Event Domain Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosNotification = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosEventDomain @@ -164,7 +192,13 @@ Orber OMG Event Domain Service. %package cosFileTransfer Summary: Orber OMG File Transfer Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosProperty = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosFileTransfer @@ -173,7 +207,12 @@ Orber OMG File Transfer Service. %package cosNotification Summary: Orber OMG Notification Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosEvent = %{version}-%{release} +Requires: %{name}-cosTime = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosNotification @@ -182,7 +221,11 @@ Orber OMG Notification Service. %package cosProperty Summary: Orber OMG Property Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosProperty @@ -191,7 +234,11 @@ Orber OMG Property Service. %package cosTime Summary: Orber OMG Timer and TimerEvent Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-cosEvent = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description cosTime @@ -200,7 +247,10 @@ Orber OMG Timer and TimerEvent Service. %package cosTransactions Summary: Orber OMG Transaction Service Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-orber = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 Obsoletes: %{name}-cosTransaction < R13B-04.7 @@ -210,7 +260,9 @@ Orber OMG Transaction Service. %package crypto Summary: Cryptographical support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description crypto @@ -219,7 +271,12 @@ Cryptographical support. %package debugger Summary: A debugger for debugging and testing of Erlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description debugger @@ -228,7 +285,14 @@ A debugger for debugging and testing of Erlang programs. %package dialyzer Summary: A DIscrepany AnaLYZer for ERlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description dialyzer @@ -247,7 +311,11 @@ Documentation for Erlang. %package docbuilder Summary: Tool for generating HTML documentation for applications Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-edoc = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-xmerl = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description docbuilder @@ -256,7 +324,13 @@ Tool for generating HTML documentation for applications. %package edoc Summary: A utility used to generate documentation out of tags in source files Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-xmerl = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description edoc @@ -283,6 +357,8 @@ Low level interface to C. %package erts Summary: Functionality necessary to run the Erlang System itself Group: Development/Languages +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description erts @@ -291,7 +367,12 @@ Functionality necessary to run the Erlang System itself. %package et Summary: An event tracer for Erlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description et @@ -300,7 +381,9 @@ An event tracer for Erlang programs. %package eunit Summary: Support for unit testing Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description eunit @@ -318,7 +401,9 @@ Examples for some Erlang modules. %package gs Summary: A library for Tcl/Tk support in Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} BuildRequires: tcl-devel BuildRequires: tk-devel Requires: tk @@ -330,7 +415,11 @@ A Graphics System used to write platform independent user interfaces. %package hipe Summary: High Performance Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description hipe @@ -339,7 +428,9 @@ High Performance Erlang. %package ic Summary: IDL compiler Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ic @@ -348,7 +439,12 @@ IDL compiler. %package inets Summary: A set of services such as a Web server and a ftp client etc Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description inets @@ -357,7 +453,10 @@ A set of services such as a Web server and a ftp client etc. %package inviso Summary: A trace tool for both development and delivered systems Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description inviso @@ -376,7 +475,8 @@ Low level interface to Java. %package kernel Summary: Main erlang library Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description kernel @@ -385,7 +485,13 @@ Main erlang library. %package megaco Summary: Megaco/H.248 support library Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-asn1 = %{version}-%{release} +Requires: %{name}-debugger = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-et = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description megaco @@ -396,7 +502,9 @@ from media conversion. %package mnesia Summary: A heavy duty real-time distributed database Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description mnesia @@ -405,7 +513,14 @@ A heavy duty real-time distributed database. %package observer Summary: A set of tools for tracing and investigation of distributed systems Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-et = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description observer @@ -414,7 +529,9 @@ A set of tools for tracing and investigation of distributed systems. %package odbc Summary: A library for unixODBC support in Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 BuildRequires: unixODBC-devel @@ -425,7 +542,12 @@ Connectivity). %package orber Summary: A CORBA Object Request Broker Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-ssl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description orber @@ -434,7 +556,13 @@ A CORBA Object Request Broker. %package os_mon Summary: A monitor which allows inspection of the underlying operating system Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-otp_mibs = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description os_mon @@ -443,7 +571,11 @@ A monitor which allows inspection of the underlying operating system. %package otp_mibs Summary: SNMP management information base for Erlang/OTP nodes Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-snmp = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description otp_mibs @@ -452,7 +584,9 @@ SNMP management information base for Erlang/OTP nodes. %package parsetools Summary: A set of parsing and lexical analysis tools Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description parsetools @@ -461,7 +595,11 @@ A set of parsing and lexical analysis tools. %package percept Summary: A concurrency profiler tool Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description percept @@ -470,7 +608,10 @@ A concurrency profiler tool. %package pman Summary: A graphical process manager used to inspect Erlang processes Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description pman @@ -479,7 +620,10 @@ A graphical process manager used to inspect Erlang processes. %package public_key Summary: API to public key infrastructure Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description public_key @@ -488,7 +632,13 @@ API to public key infrastructure. %package reltool Summary: A release management tool Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-syntax_tools = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} +Requires: %{name}-wx = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description reltool @@ -510,7 +660,9 @@ Necessary macros for building Erlang. %package runtime_tools Summary: A set of tools to include in a production system Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description runtime_tools @@ -519,7 +671,10 @@ A set of tools to include in a production system. %package sasl Summary: The System Architecture Support Libraries Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description sasl @@ -529,7 +684,12 @@ release upgrades and alarm handling etc. %package snmp Summary: Simple Network Management Protocol (SNMP) support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description snmp @@ -539,7 +699,11 @@ MIB compiler and tools for creating SNMP agents. %package ssh Summary: Secure Shell application with sftp and ssh support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-public_key = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ssh @@ -548,7 +712,11 @@ Secure Shell application with sftp and ssh support. %package ssl Summary: Secure Socket Layer support Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-public_key = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description ssl @@ -557,7 +725,10 @@ Secure Socket Layer support. %package stdlib Summary: The Erlang standard libraries Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description stdlib @@ -566,7 +737,9 @@ The Erlang standard libraries. %package syntax_tools Summary: A set of tools for dealing with erlang sources Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description syntax_tools @@ -576,7 +749,13 @@ reading source files differently, pretty-printing syntax trees. %package test_server Summary: The OTP Test Server Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-observer = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-sasl = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description test_server @@ -585,7 +764,10 @@ The OTP Test Server. %package toolbar Summary: A tool bar simplifying access to the Erlang tools Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description toolbar @@ -594,7 +776,13 @@ A tool bar simplifying access to the Erlang tools. %package tools Summary: A set of programming tools including a coverage analyzer etc Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-runtime_tools = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} +Requires: %{name}-webtool = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description tools @@ -603,7 +791,12 @@ A set of programming tools including a coverage analyzer etc. %package tv Summary: An ETS and MNESIA graphical table visualizer Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-gs = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-mnesia = %{version}-%{release} +Requires: %{name}-pman = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description tv @@ -612,7 +805,12 @@ An ETS and MNESIA graphical table visualizer. %package typer Summary: TYPe annotator for ERlang programs Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-compiler = %{version}-%{release} +Requires: %{name}-dialyzer = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-hipe = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description typer @@ -621,7 +819,11 @@ TYPe annotator for ERlang programs. %package webtool Summary: A tool that simplifying the use of web based Erlang tools Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-inets = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-observer = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description webtool @@ -630,7 +832,9 @@ A tool that simplifying the use of web based Erlang tools. %package wx Summary: A library for wxWidgets support in Erlang Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Requires: mesa-libGL Requires: mesa-libGLU Obsoletes: %{name} < R13B-04.5 @@ -642,7 +846,9 @@ A Graphics System used to write platform independent user interfaces. %package xmerl Summary: Provides support for XML 1.0 Group: Development/Languages -Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-erts = %{version}-%{release} +Requires: %{name}-kernel = %{version}-%{release} +Requires: %{name}-stdlib = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description xmerl @@ -1717,6 +1923,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 6 2010 Peter Lemenkov - R13B-04.10 +- Disabled automatic requires/provides generation + * Wed Apr 28 2010 Peter Lemenkov - R13B-04.9 - Added missing files, necessary for emacs (see rhbz #585349) - Patches rebased -- cgit From bd415d91617256d36e5fe739fae8e76852a351c8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 14 May 2010 12:56:42 +0000 Subject: Do not mention nteventlog in os_mon.app (rhbz #592251) --- erlang.spec | 11 ++++++++--- import.log | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 991efac..2deedb8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.10%{?dist} +Release: %{rel}.11%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -38,7 +38,7 @@ BuildRequires: flex BuildRequires: m4 BuildRequires: fop BuildRequires: libxslt -# Required for erlang-rpm-macros +# Required for building docs (escript) BuildRequires: erlang Requires: erlang-appmon = %{version}-%{release} @@ -913,6 +913,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.* rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.* +# Do not mention nteventlog in os_mon.app, see rhbz #592251 +sed -i "s,\,\s*nteventlog,," $RPM_BUILD_ROOT%{_libdir}/erlang/lib/os_mon-*/ebin/os_mon.app # VxWorks specific rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.* @@ -1184,7 +1186,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/releases/ %{_bindir}/* -%{_libdir}/erlang/bin/ +%{_libdir}/erlang/bin/* %{_libdir}/erlang/erts-*/ %{_libdir}/erlang/lib/erts-*/ %{_libdir}/erlang/man/man1/epmd.* @@ -1923,6 +1925,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 14 2010 Peter Lemenkov - R13B-04.11 +- Do not mention nteventlog in os_mon.app, see rhbz #592251 + * Thu May 6 2010 Peter Lemenkov - R13B-04.10 - Disabled automatic requires/provides generation diff --git a/import.log b/import.log index 69b579b..264f6a2 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 +erlang-R13B-04_11_fc12:F-12:erlang-R13B-04.11.fc12.src.rpm:1273841768 -- cgit From 4d7955c9513e94ce14e549602668e56621eb0d10 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 17 May 2010 14:22:52 +0000 Subject: Moved typer and dialyzer binaries to proper sub-packages --- erlang.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- import.log | 1 + 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/erlang.spec b/erlang.spec index 2deedb8..a29647a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.11%{?dist} +Release: %{rel}.12%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -943,6 +943,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man # remove unneeded files +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/info rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk @@ -1123,6 +1124,9 @@ rm -rf $RPM_BUILD_ROOT %files dialyzer %defattr(-,root,root) +%{_bindir}/dialyzer +%{_libdir}/erlang/bin/dialyzer +%{_libdir}/erlang/erts-*/bin/dialyzer %{_libdir}/erlang/lib/dialyzer-*/ %{_libdir}/erlang/man/man3/dialyzer.* @@ -1185,9 +1189,45 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/man/man7/ %dir %{_libdir}/erlang/releases/ -%{_bindir}/* -%{_libdir}/erlang/bin/* -%{_libdir}/erlang/erts-*/ +%{_bindir}/epmd +%{_bindir}/erl +%{_bindir}/erlc +%{_bindir}/escript +%{_bindir}/run_erl +%{_bindir}/to_erl +%{_libdir}/erlang/bin/epmd +%{_libdir}/erlang/bin/erl +%{_libdir}/erlang/bin/erlc +%{_libdir}/erlang/bin/escript +%{_libdir}/erlang/bin/run_erl +%{_libdir}/erlang/bin/start +%{_libdir}/erlang/bin/start.boot +%{_libdir}/erlang/bin/start.script +%{_libdir}/erlang/bin/start_clean.boot +%{_libdir}/erlang/bin/start_erl +%{_libdir}/erlang/bin/start_sasl.boot +%{_libdir}/erlang/bin/to_erl +%dir %{_libdir}/erlang/erts-*/bin +%{_libdir}/erlang/erts-*/bin/beam +%{_libdir}/erlang/erts-*/bin/beam.smp +%{_libdir}/erlang/erts-*/bin/child_setup +%{_libdir}/erlang/erts-*/bin/dyn_erl +%{_libdir}/erlang/erts-*/bin/epmd +%{_libdir}/erlang/erts-*/bin/erl +%{_libdir}/erlang/erts-*/bin/erl.src +%{_libdir}/erlang/erts-*/bin/erlc +%{_libdir}/erlang/erts-*/bin/erlexec +%{_libdir}/erlang/erts-*/bin/escript +%{_libdir}/erlang/erts-*/bin/heart +%{_libdir}/erlang/erts-*/bin/inet_gethost +%{_libdir}/erlang/erts-*/bin/run_erl +%{_libdir}/erlang/erts-*/bin/start +%{_libdir}/erlang/erts-*/bin/start.src +%{_libdir}/erlang/erts-*/bin/start_erl.src +%{_libdir}/erlang/erts-*/bin/to_erl +%{_libdir}/erlang/erts-*/include +%{_libdir}/erlang/erts-*/lib +%{_libdir}/erlang/erts-*/src %{_libdir}/erlang/lib/erts-*/ %{_libdir}/erlang/man/man1/epmd.* %{_libdir}/erlang/man/man1/erl.* @@ -1681,6 +1721,9 @@ rm -rf $RPM_BUILD_ROOT %files typer %defattr(-,root,root) +%{_bindir}/typer +%{_libdir}/erlang/bin/typer +%{_libdir}/erlang/erts-*/bin/typer %{_libdir}/erlang/lib/typer-*/ %files webtool @@ -1925,6 +1968,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 15 2010 Peter Lemenkov - R13B-04.12 +- Moved dialyzer and typer executables from erts to appropriate rpms + * Fri May 14 2010 Peter Lemenkov - R13B-04.11 - Do not mention nteventlog in os_mon.app, see rhbz #592251 diff --git a/import.log b/import.log index 264f6a2..ab393de 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 erlang-R13B-04_11_fc12:F-12:erlang-R13B-04.11.fc12.src.rpm:1273841768 +erlang-R13B-04_12_fc12:F-12:erlang-R13B-04.12.fc12.src.rpm:1274105878 -- cgit From dccfed747cb0f0425dc4ec0f044f1021589401cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:54:11 +0000 Subject: dist-git conversion --- .cvsignore | 1 - .gitignore | 1 + Makefile | 21 --------------------- branch | 1 - import.log | 9 --------- 5 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index ae1a587..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -otp_src_R13B04.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae1a587 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +otp_src_R13B04.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ef337d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: erlang -# $Id$ -NAME := erlang -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index ab393de..0000000 --- a/import.log +++ /dev/null @@ -1,9 +0,0 @@ -erlang-R13B-04_1_fc12:F-12:erlang-R13B-04.1.fc12.src.rpm:1268837646 -erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314 -erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367 -erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892 -erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343 -erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739 -erlang-R13B-04_9_fc12:F-12:erlang-R13B-04.9.fc12.src.rpm:1272528494 -erlang-R13B-04_11_fc12:F-12:erlang-R13B-04.11.fc12.src.rpm:1273841768 -erlang-R13B-04_12_fc12:F-12:erlang-R13B-04.12.fc12.src.rpm:1274105878 -- cgit