From 8d8ca20426ba5cf9478a8fd7b4a17469a0154ca4 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 14 Mar 2011 13:47:29 -0400 Subject: [PATCH 1/2] Update to 1.8.1 --- .gitignore | 1 + mercurial.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index be8b7da..c1a7772 100644 --- a/.gitignore +++ b/.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 diff --git a/mercurial.spec b/mercurial.spec index e01fbfc..acf7a39 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: Mercurial -- a distributed SCM Name: mercurial -Version: 1.8 +Version: 1.8.1 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Mar 14 2011 Neal Becker - 1.8.1-1 +- Update to 1.8.1 + * Wed Mar 2 2011 Neal Becker - 1.8-1 - Update to 1.8 diff --git a/sources b/sources index bb65f5c..80feb6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c97b39832f2da60f951d1b7701688bd2 mercurial-1.8.tar.gz +e0a8cfca69aa4003ea3187aed609d5e0 mercurial-1.8.1.tar.gz From 62904790a13ce102fbba5b8a15b9bf8c481c60b3 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 14 Mar 2011 19:12:27 -0400 Subject: [PATCH 2/2] try BR emacs-nox --- mercurial.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mercurial.spec b/mercurial.spec index acf7a39..8484383 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -3,7 +3,7 @@ Summary: Mercurial -- a distributed SCM Name: mercurial Version: 1.8.1 -Release: 1%{?dist} +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,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Mar 14 2011 Neal Becker - 1.8.1-2 +- Try BR emacs-nox + * Mon Mar 14 2011 Neal Becker - 1.8.1-1 - Update to 1.8.1