diff --git a/erlang-not-install-misc.patch b/erlang-not-install-misc.patch new file mode 100644 index 0000000..2d7f45d --- /dev/null +++ b/erlang-not-install-misc.patch @@ -0,0 +1,45 @@ +From: Peter Lemenkov +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 +--- + 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 diff --git a/erlang.changes b/erlang.changes index 24c5c18..bf12278 100644 --- a/erlang.changes +++ b/erlang.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 diff --git a/erlang.spec b/erlang.spec index a2b9422..5fcffc3 100644 --- a/erlang.spec +++ b/erlang.spec @@ -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++ @@ -196,6 +198,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 +375,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