Added missing files for emacs (see rhbz #585349)

8 files changed, 51 insertions, 15 deletions

diff --git a/erlang.spec b/erlang.spec
index 71e535e..c59a8ce 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -5,7 +5,7 @@
 
 Name:		erlang
 Version:	%{ver}
-Release:	%{rel}.8%{?dist}
+Release:	%{rel}.9%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 Group:		Development/Languages
@@ -24,11 +24,13 @@ 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
+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
@@ -650,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]
 
@@ -1714,6 +1717,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 28 2010 Peter Lemenkov <lemenkov@gmail.com> - R13B-04.9
+- Added missing files, necessary for emacs (see rhbz #585349)
+- Patches rebased
+
 * Tue Apr 27 2010 Peter Lemenkov <lemenkov@gmail.com> - R13B-04.8
 - Added missing BuildRequires libxslt (for building docs)
 - Removed %%post script completely (resolves rhbz #586428)
diff --git a/import.log b/import.log
index fddac5f..f7d7db5 100644
--- a/import.log
+++ b/import.log
@@ -6,3 +6,4 @@ erlang-R13B-04_5_fc12:HEAD:erlang-R13B-04.5.fc12.src.rpm:1272270707
 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
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 <lemenkov@gmail.com>
 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 <lemenkov@gmail.com>
 ---
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 <lemenkov@gmail.com>
 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 <lemenkov@gmail.com>
 ---
diff --git a/otp-0006-Fix-shared-libraries-installation.patch b/otp-0004-Fix-shared-libraries-installation.patch
index 2df3cb4..f828169 100644
--- a/otp-0006-Fix-shared-libraries-installation.patch
+++ b/otp-0004-Fix-shared-libraries-installation.patch
@@ -1,7 +1,7 @@
-From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001
+From edaced375235a006c87a3e15b8b17e9bc6dbb923 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Thu, 15 Apr 2010 13:31:36 +0400
-Subject: [PATCH 6/9] Fix shared libraries installation
+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
diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch
index 5e78c4a..4f55214 100644
--- a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch
+++ b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch
@@ -1,7 +1,7 @@
-From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001
+From 3475d4f155dc4bc2919e371e614fee81f01e87d5 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov@gmail.com>
 Date: Fri, 16 Apr 2010 21:13:47 +0400
-Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU
+Subject: [PATCH 5/7] Fix for dlopening libGL and libGLU
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 ---
diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0006-Fix-check-for-compile-workspace-overflow.patch
index 2e34451..37363de 100644
--- a/otp-0008-Fix-check-for-compile-workspace-overflow.patch
+++ b/otp-0006-Fix-check-for-compile-workspace-overflow.patch
@@ -1,7 +1,7 @@
-From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001
+From 400034faee44b65a5e33014e7ce4edcfcfba870f Mon Sep 17 00:00:00 2001
 From: Michael Santos <michael.santos@gmail.com>
 Date: Thu, 18 Mar 2010 20:08:10 -0400
-Subject: [PATCH 8/9] Fix check for compile workspace overflow
+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
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 <lemenkov@gmail.com>
+Date: Wed, 28 Apr 2010 14:35:59 +0400
+Subject: [PATCH 7/7] Install missing emacs files
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ 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
+