Update to 1.6

.cvsignore

@@ -1 +1 @@
-mercurial-1.5.4.tar.gz
+mercurial-1.6.tar.gz

mercurial.spec

@@ -2,7 +2,7 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.5.4
+Version: 1.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -93,7 +93,6 @@ grep -v 'hgk.py*' < %{name}.files > %{name}-base.files
 grep 'hgk.py*' < %{name}.files > %{name}-hgk.files
 
 install -D contrib/hgk       $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk
-install contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}/mercurial-convert-repo
 install contrib/hg-ssh       $RPM_BUILD_ROOT%{_bindir}
 install contrib/git-viz/{hg-viz,git-rev-tree} $RPM_BUILD_ROOT%{_bindir}
 
@@ -146,7 +145,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hg-ssh
 %{_bindir}/hg-viz
 %{_bindir}/git-rev-tree
-%{_bindir}/mercurial-convert-repo
 %dir %{_sysconfdir}/bash_completion.d/
 %dir %{_datadir}/zsh/site-functions/
 %dir %{_sysconfdir}/mercurial
@@ -170,6 +168,12 @@ rm -rf $RPM_BUILD_ROOT
 ##cd tests && %{__python} run-tests.py
 
 %changelog
+* Sun Jul  4 2010 Neal Becker <ndbecker2@gmail.com> - 1.6-1
+- Update to 1.6
+
+* Fri Jun 25 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.4-1
+- Don't install mercurial-convert-repo (use hg convert instead)
+
 * Wed Jun  2 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.4-1
 - Update to 1.5.4
 

sources

@@ -1 +1 @@
-db0d673000463fae1ca5cb8a202315ae  mercurial-1.5.4.tar.gz
+e97772cb424d29d9382c41daafa6f92d  mercurial-1.6.tar.gz