Accepting request 159587 from devel:languages:erlang

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/159587
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/erlang?expand=0&rev=17
This commit is contained in:
Stephan Kulow 2013-03-21 21:02:35 +00:00 committed by Git OBS Bridge
commit 15c2808f3a
3 changed files with 207 additions and 8 deletions

View File

@ -0,0 +1,45 @@
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 25 Feb 2010 16:45:28 +0300
Subject: [PATCH] Do not format man-pages and do not install miscellaneous
utilities for dealing with man-pages.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
erts/etc/common/Makefile.in | 4 ----
erts/etc/unix/Install.src | 10 ----------
2 files changed, 14 deletions(-)
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index 5c1ce51..5a07855 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -474,10 +474,6 @@ endif
ifneq ($(INSTALL_TOP_BIN),)
$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
endif
-ifneq ($(INSTALL_MISC),)
- $(INSTALL_DIR) "$(RELEASE_PATH)/misc"
- $(INSTALL_SCRIPT) $(INSTALL_MISC) "$(RELEASE_PATH)/misc"
-endif
ifneq ($(INSTALL_ERL_OSE),)
$(INSTALL_DIR) "$(RELEASE_PATH)/build_erl_ose"
cd $(OSEETC) && $(TAR) erl_ose_$(SYSTEM_VSN).tar $(INSTALL_ERL_OSE)
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index 0f33258..01fde22 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -140,14 +140,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

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Mar 8 12:21:26 UTC 2013 - matwey.kornilov@gmail.com
- Fix erlang-src orphaned directories.
erlang-src has been split according to erlang package.
-------------------------------------------------------------------
Fri Mar 8 09:01:19 UTC 2013 - matwey.kornilov@gmail.com
- Add erlang-no-install-misc.patch:
initial Fedora name was too long for us:
otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
this patch is
* to remove generating of erlang/man/cat? directories (which were not even market as %ghost) at %post.
The man-files is gz-pped (by SUSE) and because of that, script misc/format_man_pages has been failing its job for a long time;
* to remove unused scripts from misc.
-------------------------------------------------------------------
Wed Feb 27 14:52:47 UTC 2013 - kruber@zib.de

View File

@ -39,6 +39,8 @@ Patch0: otp-R16B-rpath.patch
Patch1: erlang-ppc.patch
# PATCH-FIX-UPSTREAM fix-armv7hl.patch - matwey.kornilov@gmail.com -- this makes erlang build at Factory:ARM for armv7hl
Patch3: fix-armv7hl.patch
# PATCH-FIX-OPENSUSE erlang-not-install-misc.patch - matwey.kornilov@gmail.com -- patch from Fedora, this removes unneeded magic
Patch4: erlang-not-install-misc.patch
# autoconf is required only by fix-armv7hl.patch
BuildRequires: autoconf
BuildRequires: gcc-c++
@ -157,6 +159,96 @@ Erlang sources for all the applications in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package debugger-src
Summary: Erlang/OTP debugger application sources
Group: Development/Languages/Other
Requires: %{name}-debugger = %{version}
%description debugger-src
Erlang sources for the debugger application in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package dialyzer-src
Summary: Erlang/OTP dialyzer application sources
Group: Development/Languages/Other
Requires: %{name}-dialyzer = %{version}
%description dialyzer-src
Erlang sources for the dialyzer application in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package et-src
Summary: Erlang/OTP et application sources
Group: Development/Languages/Other
Requires: %{name}-et = %{version}
%description et-src
Erlang sources for the et application in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package gs-src
Summary: Erlang/OTP gs application sources
Group: Development/Languages/Other
Requires: %{name}-gs = %{version}
%description gs-src
Erlang sources for the gs application in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package jinterface-src
Summary: Erlang/OTP jinterface application sources
Group: Development/Languages/Other
Requires: %{name}-jinterface = %{version}
%description jinterface-src
Erlang sources for the jinterface application in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package reltool-src
Summary: Erlang/OTP reltool application sources
Group: Development/Languages/Other
Requires: %{name}-reltool = %{version}
%description reltool-src
Erlang sources for the reltool application in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package toolbar-src
Summary: Erlang/OTP toolbar application sources
Group: Development/Languages/Other
Requires: %{name}-toolbar = %{version}
%description toolbar-src
Erlang sources for the toolbar application in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package tv-src
Summary: Erlang/OTP tv application sources
Group: Development/Languages/Other
Requires: %{name}-tv = %{version}
%description tv-src
Erlang sources for the tv application in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package wx-src
Summary: Erlang/OTP wx application sources
Group: Development/Languages/Other
Requires: %{name}-wx = %{version}
%description wx-src
Erlang sources for the wx application in the Erlang/OTP system.
They are useful for educational purpose and as a base for creating
embedded systems.
%package toolbar
Summary: A tool bar simplifying access to the Erlang tools
Group: Development/Languages/Other
@ -196,6 +288,7 @@ A Graphics System used to write platform independent user interfaces.
%patch3 -p1
autoreconf -si ./erts
%endif
%patch4 -p1
chmod -R u+w .
# enable dynamic linking for ssl
@ -372,7 +465,6 @@ install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang
%{_libdir}/erlang/lib/xmerl-*/
%{_libdir}/erlang/man/
%{_mandir}/man1/*.1.gz
%{_libdir}/erlang/misc/
%{_libdir}/erlang/releases/
%{_libdir}/erlang/usr/
%{_libdir}/erlang/Install
@ -417,13 +509,6 @@ install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang
%{_libdir}/erlang/lib/reltool-*/
%exclude %{_libdir}/erlang/lib/reltool-*/src
%files src
%defattr(-,root,root)
%exclude %{_libdir}/erlang/lib/erl_interface-*/src/INSTALL
%{_libdir}/erlang/lib/*/src
%{_libdir}/erlang/lib/*/c_src
%{_libdir}/erlang/lib/*/java_src
%files toolbar
%defattr(-,root,root)
%{_libdir}/erlang/lib/toolbar-*/
@ -439,4 +524,56 @@ install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang
%{_libdir}/erlang/lib/wx-*/
%exclude %{_libdir}/erlang/lib/wx-*/src
%files src
%defattr(-,root,root)
%exclude %{_libdir}/erlang/lib/erl_interface-*/src/INSTALL
%{_libdir}/erlang/lib/*/src
%{_libdir}/erlang/lib/*/c_src
%{_libdir}/erlang/lib/*/java_src
%exclude %{_libdir}/erlang/lib/debugger-*/src
%exclude %{_libdir}/erlang/lib/dialyzer-*/src
%exclude %{_libdir}/erlang/lib/et-*/src
%exclude %{_libdir}/erlang/lib/gs-*/src
%exclude %{_libdir}/erlang/lib/jinterface-*/java_src
%exclude %{_libdir}/erlang/lib/reltool-*/src
%exclude %{_libdir}/erlang/lib/toolbar-*/src
%exclude %{_libdir}/erlang/lib/tv-*/src
%exclude %{_libdir}/erlang/lib/wx-*/src
%files debugger-src
%defattr(-,root,root)
%{_libdir}/erlang/lib/debugger-*/src
%files dialyzer-src
%defattr(-,root,root)
%{_libdir}/erlang/lib/dialyzer-*/src
%files et-src
%defattr(-,root,root)
%{_libdir}/erlang/lib/et-*/src
%files gs-src
%defattr(-,root,root)
%{_libdir}/erlang/lib/gs-*/src
%files jinterface-src
%defattr(-,root,root)
%{_libdir}/erlang/lib/jinterface-*/java_src
%files reltool-src
%defattr(-,root,root)
%{_libdir}/erlang/lib/reltool-*/src
%files toolbar-src
%defattr(-,root,root)
%{_libdir}/erlang/lib/toolbar-*/src
%files tv-src
%defattr(-,root,root)
%{_libdir}/erlang/lib/tv-*/src
%files wx-src
%defattr(-,root,root)
%{_libdir}/erlang/lib/wx-*/src
%changelog