summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Lemenkov <peter@fedoraproject.org>2010-05-14 12:54:38 +0000
committerPeter Lemenkov <peter@fedoraproject.org>2010-05-14 12:54:38 +0000
commit82eecc56316e92d5e9bf6115c0a7e7a35c4afad4 (patch)
tree8f30555734a2e07880321085fd348746c6c48f54
parent67e0a7cdbd67f66bfe53ac286b430119eaafd978 (diff)
downloaderlang-82eecc56316e92d5e9bf6115c0a7e7a35c4afad4.tar.gz
erlang-82eecc56316e92d5e9bf6115c0a7e7a35c4afad4.tar.xz
erlang-82eecc56316e92d5e9bf6115c0a7e7a35c4afad4.zip
Do not mention nteventlog in os_mon.app (rhbz #592251)
-rw-r--r--erlang.spec11
-rw-r--r--import.log1
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 <lemenkov@gmail.com> - R13B-04.11
+- Do not mention nteventlog in os_mon.app, see rhbz #592251
+
* Thu May 6 2010 Peter Lemenkov <lemenkov@gmail.com> - R13B-04.10
- Disabled automatic requires/provides generation
diff --git a/import.log b/import.log
index f7d7db5..cb30f3c 100644
--- a/import.log
+++ b/import.log
@@ -7,3 +7,4 @@ erlang-R13B-04_6_fc12:HEAD:erlang-R13B-04.6.fc12.src.rpm:1272303399
erlang-R13B-04_7_fc12:HEAD:erlang-R13B-04.7.fc12.src.rpm:1272369808
erlang-R13B-04_8_fc12:HEAD:erlang-R13B-04.8.fc12.src.rpm:1272437605
erlang-R13B-04_9_fc12:HEAD:erlang-R13B-04.9.fc12.src.rpm:1272454729
+erlang-R13B-04_11_fc12:HEAD:erlang-R13B-04.11.fc12.src.rpm:1273841579