[flim] remove elisp files that shadow libraries from emacs (#722186)

[Jens Petersen]

commit f2c4aa620b27e2be342ddfa16f453c3f1f9d7a24
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Feb 3 15:24:38 2012 +0900

    remove elisp files that shadow libraries from emacs (#722186)

 flim.spec |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/flim.spec b/flim.spec
index 8405bee..8344361 100644
--- a/flim.spec
+++ b/flim.spec
@@ -4,7 +4,7 @@
 Summary: Basic library for handling email messages for Emacs
 Name: flim
 Version: 1.14.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 URL: http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/FLIM/
@@ -40,11 +40,14 @@ make LISPDIR=$RPM_BUILD_ROOT%{lispdir}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # build for emacs
 %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} LISPDIR=$RPM_BUILD_ROOT%{lispdir}
 
+# remove files which shadow elisp files from emacs itself (#722186)
+for i in md4 hex-util sasl-cram sasl-digest ntlm sasl sasl-ntlm hmac-def hmac-md5; do
+  rm $RPM_BUILD_ROOT%{lispdir}/flim/$i.el*
+done
+
 make clean
 
 # build for xemacs
@@ -53,23 +56,20 @@ touch auto-autoloads.el custom-load.el
 make EMACS=xemacs PACKAGEDIR=$RPM_BUILD_ROOT%{pkgdir} install-package
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr (-, root, root)
 %doc FLIM-API.en README.en README.ja
 %{lispdir}
 
 
 %files xemacs
-%defattr (-, root, root)
 %doc README.en README.ja
 %{pkgdir}
 
 
 %changelog
+* Fri Feb  3 2012 Jens Petersen <petersen at redhat.com> - 1.14.9-4
+- remove elisp files that shadow libraries from emacs (Andreas Schwab, #722186)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild