[ldapvi] Don’t munch fileencoding parametr of vim

[Matej Cepl]

commit 4b77329463a7c24164cafb6b13d708070ee45ab6
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu May 12 23:56:52 2011 +0200

    Don’t munch fileencoding parametr of vim

 dont-set-encoding-in-vim-modeline.diff |   13 +++++++++++++
 ldapvi.spec                            |   11 +++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/dont-set-encoding-in-vim-modeline.diff b/dont-set-encoding-in-vim-modeline.diff
new file mode 100644
index 0000000..d3c4536
--- /dev/null
+++ b/dont-set-encoding-in-vim-modeline.diff
@@ -0,0 +1,13 @@
+diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c
+index 7b312f8..d251ee6 100644
+--- a/ldapvi/ldapvi.c
++++ b/ldapvi/ldapvi.c
+@@ -1414,7 +1414,7 @@ write_file_header(FILE *s, cmdline *cmdline)
+ 	int nlines = 0;
+ 
+ 	if (print_binary_mode == PRINT_UTF8 && !cmdline->ldif) {
+-		fputs("# -*- coding: utf-8 -*- vim:encoding=utf-8:\n", s);
++		fputs("# -*- coding: utf-8 -*- \n", s);
+ 		nlines++;
+ 	}
+ 	if (cmdline->ldif) {
diff --git a/ldapvi.spec b/ldapvi.spec
index 5b63570..14d77f6 100644
--- a/ldapvi.spec
+++ b/ldapvi.spec
@@ -1,6 +1,6 @@
 Name:           ldapvi
 Version:        1.7
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
@@ -9,6 +9,10 @@ URL:            http://www.lichteblau.com/ldapvi/
 Source0:        http://www.lichteblau.com/download/ldapvi-%{version}.tar.gz
 Patch0:         GNUmakefile.in.patch
 Patch1:         %{name}-1.7-getline.patch
+# discussed upstream
+# http://lists.askja.de/pipermail/ldapvi/2011-January/000089.html
+# but never applied
+Patch2:         dont-set-encoding-in-vim-modeline.diff
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
@@ -28,7 +32,7 @@ it as vipw(1) for LDAP.
 %setup -q
 %patch0 -p0 -b .gnumk
 %patch1 -p2 -b .getline
-
+%patch2 -p2 -b .encoding
 
 %build
 %configure
@@ -55,6 +59,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu May 12 2011 Matěj Cepl <mcepl at redhat.com> - 1.7-12
+- don't play with the file encoding (#691958)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild