From 42d1f53e28f0796a40b87e4fd53d2d8b86b467ce Mon Sep 17 00:00:00 2001
From: Neal Becker <nbecker@fedoraproject.org>
Date: Feb 23 2009 20:25:32 +0000
Subject: fix 487015


---

diff --git a/mercurial.spec b/mercurial.spec
index 0fa81b0..ecfc7a7 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: 3%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -147,9 +147,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hg-viz
 %{_bindir}/git-rev-tree
 %{_bindir}/mercurial-convert-repo
+%dir %{_sysconfdir}/bash_completion.d/
+%dir %{_datadir}/zsh/site-functions/
 %dir %{_sysconfdir}/mercurial
 %dir %{_sysconfdir}/mercurial/hgrc.d
-%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%config %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 %dir %{python_sitearch}/mercurial
 %dir %{python_sitearch}/hgext
 
@@ -168,6 +170,16 @@ rm -rf $RPM_BUILD_ROOT
 #cd tests && %{__python} run-tests.py
 
 %changelog
+* Mon Feb 23 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-6
+- Fix typo
+
+* Mon Feb 23 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-5
+- Own directories bash_completion.d and zsh/site-functions
+  https://bugzilla.redhat.com/show_bug.cgi?id=487015
+
+* Mon Feb  9 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-4
+- Mark mergetools.rc as config
+
 * Sat Feb  7 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-3
 - Patch mergetools.rc to fix filemerge bug