rpms/emacs/devel emacs.spec,1.139,1.140

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15604

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



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- emacs.spec	24 Sep 2009 09:44:20 -0000	1.139
+++ emacs.spec	29 Sep 2009 10:09:17 -0000	1.140
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -51,6 +51,9 @@ BuildRequires: desktop-file-utils
 Requires:      desktop-file-utils
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
+# #516391
+Obsoletes: emacs-nxml-mode < 0.20041004-10
+Provides: emacs-nxml-mode = 0.20041004-10
 
 # C and build 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-10
+- emacs contains nxml-mode (#516391)
+
 * Thu Sep 24 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-9
 - use xdg-open(1) for opening URLs (#316131)