Merge branch 'master' into f13

.gitignore

@@ -9,3 +9,4 @@ mercurial-1.6.2.tar.gz
 /mercurial-1.7.3.tar.gz
 /mercurial-1.7.5.tar.gz
 /mercurial-1.8.tar.gz
+/mercurial-1.8.1.tar.gz

mercurial.spec

@@ -2,8 +2,8 @@
 
 Summary: Mercurial -- a distributed SCM
 Name: mercurial
-Version: 1.8
-Release: 1%{?dist}
+Version: 1.8.1
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -12,7 +12,7 @@ Source1: mercurial-site-start.el
 Patch0: mercurial-i18n.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python python-devel
-BuildRequires: emacs emacs-el pkgconfig gettext python-docutils
+BuildRequires: emacs-nox emacs-el pkgconfig gettext python-docutils
 Requires: python
 Provides: hg = %{version}-%{release}
 
@@ -173,6 +173,12 @@ rm -rf $RPM_BUILD_ROOT
 ##cd tests && %{__python} run-tests.py
 
 %changelog
+* Mon Mar 14 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.1-2
+- Try BR emacs-nox
+
+* Mon Mar 14 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.1-1
+- Update to 1.8.1
+
 * Wed Mar  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.8-1
 - Update to 1.8
 

sources

@@ -1 +1 @@
-c97b39832f2da60f951d1b7701688bd2  mercurial-1.8.tar.gz
+e0a8cfca69aa4003ea3187aed609d5e0  mercurial-1.8.1.tar.gz