Use noreplace option on config

This commit is contained in:
Neal Becker 2009-02-24 19:24:04 +00:00
parent d53bc13976
commit 13f9070ae7

View File

@ -3,7 +3,7 @@
Summary: A fast, lightweight distributed source control management system Summary: A fast, lightweight distributed source control management system
Name: mercurial Name: mercurial
Version: 1.1.2 Version: 1.1.2
Release: 6%{?dist} Release: 7%{?dist}
License: GPLv2 License: GPLv2
Group: Development/Tools Group: Development/Tools
URL: http://www.selenic.com/mercurial/ URL: http://www.selenic.com/mercurial/
@ -151,7 +151,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/zsh/site-functions/ %dir %{_datadir}/zsh/site-functions/
%dir %{_sysconfdir}/mercurial %dir %{_sysconfdir}/mercurial
%dir %{_sysconfdir}/mercurial/hgrc.d %dir %{_sysconfdir}/mercurial/hgrc.d
%config %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc %config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
%dir %{python_sitearch}/mercurial %dir %{python_sitearch}/mercurial
%dir %{python_sitearch}/hgext %dir %{python_sitearch}/hgext
@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
#cd tests && %{__python} run-tests.py #cd tests && %{__python} run-tests.py
%changelog %changelog
* Tue Feb 24 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-7
- Use noreplace option on config
* Mon Feb 23 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-6 * Mon Feb 23 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-6
- Fix typo - Fix typo