rpms/emacs/F-11 emacs.spec,1.130,1.131

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/emacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28497

Modified Files:
	emacs.spec 
Log Message:
fix #516391



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/emacs.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- emacs.spec	22 Sep 2009 11:22:45 -0000	1.130
+++ emacs.spec	29 Sep 2009 11:04:59 -0000	1.131
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -49,6 +49,9 @@ Requires:      desktop-file-utils
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
 
+Obsoletes: emacs-nxml-mode < 0.20041004-10
+Provides: emacs-nxml-mode = 0.20041004-10
+
 # C and build patches
 
 # Lisp and doc patches
@@ -378,6 +381,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-5
+- emacs contains nxml-mode (#516391)
+
 * Tue Sep 22 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-4
 - update %%info_files (#510750)