Merge branch 'master' into f13

This commit is contained in:
Neal Becker 2010-08-27 07:21:58 -04:00
commit d458fd6427

View File

@ -1,9 +1,9 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Summary: A fast, lightweight distributed source control management system Summary: Mercurial -- a distributed SCM
Name: mercurial Name: mercurial
Version: 1.6.3 Version: 1.6.3
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Development/Tools Group: Development/Tools
URL: http://www.selenic.com/mercurial/ URL: http://www.selenic.com/mercurial/
@ -57,9 +57,7 @@ Group: Applications/Editors
Requires: emacs-%{pkg} = %{version}-%{release} Requires: emacs-%{pkg} = %{version}-%{release}
%description -n emacs-%{pkg}-el %description -n emacs-%{pkg}-el
This package contains the elisp source files for %{pkg} under GNU Emacs. You This package contains the elisp source files for %{pkg} under GNU Emacs.
do not need to install this package to run %{pkg}. Install the emacs-%{pkg}
package to use %{pkg} with GNU Emacs.
%package hgk %package hgk
Summary: Hgk interface for mercurial Summary: Hgk interface for mercurial
@ -92,8 +90,8 @@ make install-doc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
grep -v 'hgk.py*' < %{name}.files > %{name}-base.files grep -v 'hgk.py*' < %{name}.files > %{name}-base.files
grep 'hgk.py*' < %{name}.files > %{name}-hgk.files grep 'hgk.py*' < %{name}.files > %{name}-hgk.files
install -D contrib/hgk $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk install -D -m 755 contrib/hgk $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk
install contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir} install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}
bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
mkdir -p $bash_completion_dir mkdir -p $bash_completion_dir
@ -127,9 +125,9 @@ hgk=
[hgk] [hgk]
path=%{_libexecdir}/mercurial/hgk path=%{_libexecdir}/mercurial/hgk
EOF EOF
install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d install -m 644 hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -139,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi %doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi
%doc %attr(644,root,root) %{_mandir}/man?/hg*.gz %doc %attr(644,root,root) %{_mandir}/man?/hg*.gz
%doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc %doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
%{_sysconfdir}/bash_completion.d/mercurial.sh %config(noreplace) %{_sysconfdir}/bash_completion.d/mercurial.sh
%{_datadir}/zsh/site-functions/_mercurial %{_datadir}/zsh/site-functions/_mercurial
%{_bindir}/hg-ssh %{_bindir}/hg-ssh
%dir %{_sysconfdir}/bash_completion.d/ %dir %{_sysconfdir}/bash_completion.d/
@ -168,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT
##cd tests && %{__python} run-tests.py ##cd tests && %{__python} run-tests.py
%changelog %changelog
* Fri Aug 27 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.3-1
- Fix some rpmlint issues
* Thu Aug 26 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.3-1 * Thu Aug 26 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.3-1
- Update to 1.6.3 - Update to 1.6.3