From 8c1b29cd80fc5ad8d240bfc877238da578373ace Mon Sep 17 00:00:00 2001
From: Daniel Novotny <dnovotny@fedoraproject.org>
Date: Sep 29 2009 11:04:59 +0000
Subject: fix #516391


---

diff --git a/emacs.spec b/emacs.spec
index d464db7..dbc6fe6 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -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 emacs.etags %{_bindir}/etags.emacs 80 \
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Sep 29 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-5
+- emacs contains nxml-mode (#516391)
+
 * Tue Sep 22 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-4
 - update %%info_files (#510750)