rpms/emacs/devel emacs.spec,1.69,1.70

[fedora-cvs-commits at redhat.com]

Author: coldwell

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9617

Modified Files:
	emacs.spec 
Log Message:
don't clobber site-lisp/default.el (Ritesh Khadgaray, 180153)


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- emacs.spec	7 Mar 2006 12:04:00 -0000	1.69
+++ emacs.spec	18 Apr 2006 17:24:17 -0000	1.70
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 14
+Release: 14.1
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -533,7 +533,7 @@
 %if %{emacs21}
 %exclude %{emacs_libexecdir}/fns-%{version}.*.el
 %endif
-%attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/default.el
+%attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el
 %attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el
 
 %files -f el-filelist el
@@ -549,6 +549,9 @@
 %endif
 
 %changelog
+* Tue Apr 18 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-14.1
+- don't clobber site-lisp/default.el (Ritesh Khadgaray, 180153)
+
 * Tue Mar  7 2006 Jens Petersen <petersen at redhat.com> - 21.4-14
 - bring back setarch for i386 with -R option in spec file and drop
   emacs-21-personality-linux32-101818.patch since it no longer seems