diff --git a/mercurial.spec b/mercurial.spec index 8a582d9..0a7b03f 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -3,7 +3,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -147,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mercurial-convert-repo %dir %{_sysconfdir}/mercurial %dir %{_sysconfdir}/mercurial/hgrc.d -%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc +%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample %dir %{python_sitearch}/mercurial %dir %{python_sitearch}/hgext @@ -166,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT #cd tests && %{__python} run-tests.py %changelog +* Thu Jan 1 2009 Neal Becker - 1.1.2-2 +- Rename mergetools.rc -> mergetools.rc.sample + * Thu Jan 1 2009 Neal Becker - 1.1.2-1 - Update to 1.1.2