Merge branch 'master' into f13

2011-03-02 08:13:26 -05:00 · 2011-03-02 08:13:26 -05:00 · 310fd584ef
commit 310fd584ef
parent f2c0ab88d7 bd336b674e
3 changed files with 9 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@ mercurial-1.6.2.tar.gz
 /mercurial-1.7.2.tar.gz
 /mercurial-1.7.3.tar.gz
 /mercurial-1.7.5.tar.gz
+/mercurial-1.8.tar.gz
--- a/mercurial.spec
+++ b/mercurial.spec
@ -2,7 +2,7 @@

 Summary: Mercurial -- a distributed SCM
 Name: mercurial
-Version: 1.7.5
+Version: 1.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@ -173,6 +173,12 @@ rm -rf $RPM_BUILD_ROOT
 ##cd tests && %{__python} run-tests.py

 %changelog
+* Wed Mar  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.8-1
+- Update to 1.8
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sat Feb  5 2011 Neal Becker <ndbecker2@gmail.com> - 1.7.5-1
 - Update to 1.7.5

--- a/2
+++ b/2
@ -1 +1 @@
-269e924b3770535cf72049db01c35afa  mercurial-1.7.5.tar.gz
+c97b39832f2da60f951d1b7701688bd2  mercurial-1.8.tar.gz