7d0f2b
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
7d0f2b
7d0f2b
Summary: Mercurial -- a distributed SCM
7d0f2b
Name: mercurial
7d0f2b
Version: 2.6.2
287542
Release: 11%{?dist}
7d0f2b
#Release: 1.rc1%{?dist}
7d0f2b
7d0f2b
#%define upstreamversion %{version}-rc
7d0f2b
%define upstreamversion %{version}
7d0f2b
7d0f2b
License: GPLv2+
7d0f2b
Group: Development/Tools
7d0f2b
URL: http://www.selenic.com/mercurial/
7d0f2b
#Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
7d0f2b
Source0: http://www.selenic.com/mercurial/release/%{name}-%{upstreamversion}.tar.gz
7d0f2b
Source1: mercurial-site-start.el
7d0f2b
Patch0: mercurial-i18n.patch
7d0f2b
#Patch1: docutils-0.8.patch
7d0f2b
#Make hg-ssh's shebang pathname absolute (#987029)
7d0f2b
Patch2: mercurial-absolute-shebang.patch
7d0f2b
7d0f2b
Patch3: mercurial-cve-2016-3068.patch
7d0f2b
Patch4: mercurial-cve-2016-3069.patch
7d0f2b
Patch5: mercurial-cve-2017-9462.patch
7d0f2b
Patch6: mercurial-cve-2017-1000115-1000116.patch
7d0f2b
Patch7: mercurial-cve-2018-1000132.patch
7d0f2b
Patch8: mercurial-cve-2018-13346-cve-2018-13347.patch
287542
Patch9: mercurial-fix-cve-2018-13346-cve-2018-13347-regression.patch
7d0f2b
7d0f2b
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
7d0f2b
BuildRequires: python python-devel
7d0f2b
BuildRequires: emacs-nox emacs-el pkgconfig gettext python-docutils
7d0f2b
Requires: python
7d0f2b
Provides: hg = %{version}-%{release}
7d0f2b
7d0f2b
%description
7d0f2b
Mercurial is a fast, lightweight source control management system designed
7d0f2b
for efficient handling of very large distributed projects.
7d0f2b
7d0f2b
Quick start: http://www.selenic.com/mercurial/wiki/index.cgi/QuickStart
7d0f2b
Tutorial: http://www.selenic.com/mercurial/wiki/index.cgi/Tutorial
7d0f2b
Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
7d0f2b
7d0f2b
%define pkg mercurial
7d0f2b
7d0f2b
# If the emacs-el package has installed a pkgconfig file, use that to determine
7d0f2b
# install locations and Emacs version at build time, otherwise set defaults.
7d0f2b
%if %($(pkg-config emacs) ; echo $?)
7d0f2b
%define emacs_version 22.1
7d0f2b
%define emacs_lispdir %{_datadir}/emacs/site-lisp
7d0f2b
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
7d0f2b
%else
7d0f2b
%define emacs_version %{expand:%(pkg-config emacs --modversion)}
7d0f2b
%define emacs_lispdir %{expand:%(pkg-config emacs --variable sitepkglispdir)}
7d0f2b
%define emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)}
7d0f2b
%endif
7d0f2b
7d0f2b
%package -n emacs-%{pkg}
7d0f2b
Summary:	Mercurial version control system support for Emacs
7d0f2b
Group:		Applications/Editors
7d0f2b
Requires:	hg = %{version}-%{release}, emacs-common
7d0f2b
Requires:       emacs(bin) >= %{emacs_version}
7d0f2b
Obsoletes:	%{pkg}-emacs
7d0f2b
7d0f2b
%description -n emacs-%{pkg}
7d0f2b
Contains byte compiled elisp packages for %{pkg}.
7d0f2b
To get started: start emacs, load hg-mode with M-x hg-mode, and show 
7d0f2b
help with C-c h h
7d0f2b
7d0f2b
%package -n emacs-%{pkg}-el
7d0f2b
Summary:        Elisp source files for %{pkg} under GNU Emacs
7d0f2b
Group:          Applications/Editors
7d0f2b
Requires:       emacs-%{pkg} = %{version}-%{release}
7d0f2b
7d0f2b
%description -n emacs-%{pkg}-el
7d0f2b
This package contains the elisp source files for %{pkg} under GNU Emacs.
7d0f2b
7d0f2b
%package hgk
7d0f2b
Summary:	Hgk interface for mercurial
7d0f2b
Group:		Development/Tools
7d0f2b
Requires:	hg = %{version}-%{release}, tk
7d0f2b
7d0f2b
7d0f2b
%description hgk
7d0f2b
A Mercurial extension for displaying the change history graphically
7d0f2b
using Tcl/Tk.  Displays branches and merges in an easily
7d0f2b
understandable way and shows diffs for each revision.  Based on
7d0f2b
gitk for the git SCM.
7d0f2b
7d0f2b
Adds the "hg view" command.  See 
7d0f2b
http://www.selenic.com/mercurial/wiki/index.cgi/UsingHgk for more
7d0f2b
documentation.
7d0f2b
7d0f2b
%prep
7d0f2b
#%setup -q
7d0f2b
%setup -q -n %{name}-%{upstreamversion}
7d0f2b
%patch0 -p0
7d0f2b
#%patch1 -p1
7d0f2b
%patch2 -p1
7d0f2b
%patch3 -p1
7d0f2b
%patch4 -p1
7d0f2b
%patch5 -p1
7d0f2b
%patch6 -p1
7d0f2b
%patch7 -p1
7d0f2b
%patch8 -p1
287542
%patch9 -p1
7d0f2b
7d0f2b
%build
7d0f2b
make all
7d0f2b
7d0f2b
%install
7d0f2b
rm -rf $RPM_BUILD_ROOT
7d0f2b
%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --prefix %{_prefix} --record=%{name}.files
7d0f2b
make install-doc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
7d0f2b
7d0f2b
grep -v -e 'hgk.py*' -e %{python_sitearch}/mercurial/ -e %{python_sitearch}/hgext/ < %{name}.files > %{name}-base.files
7d0f2b
grep 'hgk.py*' < %{name}.files > %{name}-hgk.files
7d0f2b
7d0f2b
install -D -m 755 contrib/hgk       $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk
7d0f2b
install -m 755 contrib/hg-ssh       $RPM_BUILD_ROOT%{_bindir}
7d0f2b
7d0f2b
bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
7d0f2b
mkdir -p $bash_completion_dir
7d0f2b
install -m 644 contrib/bash_completion $bash_completion_dir/mercurial.sh
7d0f2b
7d0f2b
zsh_completion_dir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
7d0f2b
mkdir -p $zsh_completion_dir
7d0f2b
install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial
7d0f2b
7d0f2b
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
7d0f2b
7d0f2b
pushd contrib
7d0f2b
for file in mercurial.el mq.el; do
7d0f2b
  #emacs -batch -l mercurial.el --no-site-file -f batch-byte-compile $file
7d0f2b
  %{_emacs_bytecompile} $file
7d0f2b
  install -p -m 644 $file ${file}c $RPM_BUILD_ROOT%{emacs_lispdir}
7d0f2b
  rm ${file}c
7d0f2b
done
7d0f2b
popd
7d0f2b
7d0f2b
7d0f2b
7d0f2b
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
7d0f2b
7d0f2b
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} && install -m644 %SOURCE1 $RPM_BUILD_ROOT%{emacs_startdir}
7d0f2b
7d0f2b
cat >hgk.rc <
7d0f2b
[extensions]
7d0f2b
# enable hgk extension ('hg help' shows 'view' as a command)
7d0f2b
hgk=
7d0f2b
7d0f2b
[hgk]
7d0f2b
path=%{_libexecdir}/mercurial/hgk
7d0f2b
EOF
7d0f2b
install -m 644 hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
7d0f2b
7d0f2b
cat > certs.rc <
7d0f2b
# see: http://mercurial.selenic.com/wiki/CACertificates
7d0f2b
[web]
7d0f2b
cacerts = /etc/pki/tls/certs/ca-bundle.crt
7d0f2b
EOF
7d0f2b
install -m 644 certs.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
7d0f2b
7d0f2b
install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
7d0f2b
7d0f2b
mv $RPM_BUILD_ROOT%{python_sitearch}/mercurial/locale $RPM_BUILD_ROOT%{_datadir}/locale
7d0f2b
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/mercurial/locale
7d0f2b
7d0f2b
7d0f2b
%find_lang hg
7d0f2b
7d0f2b
grep -v locale %{name}-base.files > %{name}-base-filtered.files
7d0f2b
7d0f2b
%clean
7d0f2b
rm -rf $RPM_BUILD_ROOT
7d0f2b
7d0f2b
%files -f %{name}-base-filtered.files -f hg.lang
7d0f2b
%defattr(-,root,root,-)
7d0f2b
%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi contrib/*.wsgi
7d0f2b
%doc %attr(644,root,root) %{_mandir}/man?/hg*.gz
7d0f2b
%doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
7d0f2b
%config(noreplace) %{_sysconfdir}/bash_completion.d/mercurial.sh
7d0f2b
%{_datadir}/zsh/site-functions/_mercurial
7d0f2b
%{_bindir}/hg-ssh
7d0f2b
%dir %{_sysconfdir}/bash_completion.d/
7d0f2b
%dir %{_datadir}/zsh/
7d0f2b
%{_datadir}/zsh/site-functions/
7d0f2b
%dir %{_sysconfdir}/mercurial
7d0f2b
%dir %{_sysconfdir}/mercurial/hgrc.d
7d0f2b
%{python_sitearch}/mercurial
7d0f2b
%{python_sitearch}/hgext
7d0f2b
%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
7d0f2b
%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/certs.rc
7d0f2b
7d0f2b
%files -n emacs-%{pkg}
7d0f2b
%defattr(-,root,root,-)
7d0f2b
%{emacs_lispdir}/*.elc
7d0f2b
%{emacs_startdir}/*.el
7d0f2b
7d0f2b
%files -n emacs-%{pkg}-el
7d0f2b
%defattr(-,root,root,-)
7d0f2b
%{emacs_lispdir}/*.el
7d0f2b
7d0f2b
%files hgk -f %{name}-hgk.files
7d0f2b
%defattr(-,root,root,-)
7d0f2b
%{_libexecdir}/mercurial/
7d0f2b
%{_sysconfdir}/mercurial/hgrc.d/hgk.rc
7d0f2b
7d0f2b
#%%check
7d0f2b
#cd tests && %%{__python} run-tests.py
7d0f2b
7d0f2b
%changelog
287542
* Thu Oct 10 2019 Marcel Plch <mplch@redhat.com> - 2.6.2-11
287542
- Fix a regression caused by previous CVE fix
287542
- Resolves: rhbz#1740266
287542
7d0f2b
* Tue May 07 2019 Marcel Plch <mplch@redhat.com> - 2.6.2-10
7d0f2b
- Add missing hunk for CVE-2018-13347 patch
7d0f2b
- Related: CVE-2018-13347
7d0f2b
7d0f2b
* Wed Mar 20 2019 Marcel Plch <mplch@redhat.com> - 2.6.2-9
7d0f2b
- Fix various CVE's
7d0f2b
- Resolves: CVE-2018-1000132 CVE-2018-13346 CVE-2018-13347
7d0f2b
7d0f2b
* Tue Aug 15 2017 Petr Stodulka <pstodulk@redhat.com> - 2.6.2-8
7d0f2b
- Fix CVE-2017-1000115 and CVE-2017-1000116
7d0f2b
7d0f2b
* Thu Jun 15 2017 Petr Stodulka <pstodulk@redhat.com> - 2.6.2-7
7d0f2b
- Fix CVE-2017-9462
7d0f2b
7d0f2b
* Thu Apr 14 2016 Petr Stodulka <pstodulk@redhat.com> - 2.6.2-6
7d0f2b
- fix previous patch for CVE-2016-3069
7d0f2b
7d0f2b
* Thu Apr 14 2016 Petr Stodulka <pstodulk@redhat.com> - 2.6.2-5
7d0f2b
- Fix CVE-2016-3068 and CVE-2016-3069
7d0f2b
7d0f2b
* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 2.6.2-4
7d0f2b
- Mass rebuild 2014-01-24
7d0f2b
7d0f2b
* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 2.6.2-3
7d0f2b
- Mass rebuild 2013-12-27
7d0f2b
7d0f2b
* Fri Oct 4 2013 Ondrej Oprala <ooprala@redhat.com> - 2.6.2-2
7d0f2b
- Use an absolute pathname in hg-ssh's shebang (#987029)
7d0f2b
7d0f2b
* Thu Jun 6 2013 nbecker <ndbecker2@gmail.com> - 2.6.2-1
7d0f2b
- Update to 2.6.2
7d0f2b
7d0f2b
* Wed May  8 2013 nbecker <ndbecker2@gmail.com> - 2.6-1
7d0f2b
- Update to 2.6
7d0f2b
7d0f2b
* Mon Mar 18 2013 nbecker <ndbecker2@gmail.com> - 2.5.2-2
7d0f2b
- Add hgweb.wsgi
7d0f2b
7d0f2b
* Sat Mar  2 2013 nbecker <ndbecker2@gmail.com> - 2.5.2-1
7d0f2b
- Update to 2.5.2
7d0f2b
7d0f2b
* Sat Feb  9 2013 Neal Becker <ndbecker2@gmail.com> - 2.5.1-1
7d0f2b
- Update to 2.5.1
7d0f2b
7d0f2b
* Tue Feb  5 2013 Neal Becker <ndbecker2@gmail.com> - 2.5-1
7d0f2b
- Update to 2.5
7d0f2b
7d0f2b
* Sun Dec 16 2012 Neal Becker <ndbecker2@gmail.com> - 2.4.1-1
7d0f2b
- Update to 2.4.1
7d0f2b
7d0f2b
* Sun Nov  4 2012 Neal Becker <ndbecker2@gmail.com> - 2.4-1
7d0f2b
- Update to 2.4
7d0f2b
7d0f2b
* Wed Sep  5 2012 Neal Becker <ndbecker2@gmail.com> - 2.3.1-1
7d0f2b
- Update to 2.3.1
7d0f2b
7d0f2b
* Mon Aug 13 2012 Neal Becker <ndbecker2@gmail.com> - 2.3-1
7d0f2b
- Update to 2.3
7d0f2b
7d0f2b
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.3-2
7d0f2b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
7d0f2b
7d0f2b
* Mon Jul  9 2012 Neal Becker <ndbecker2@gmail.com> - 2.2.3-1
7d0f2b
- Update to 2.2.3
7d0f2b
7d0f2b
* Sun Jun  3 2012 Neal Becker <ndbecker2@gmail.com> - 2.2.2-1
7d0f2b
- Update to 2.2.2
7d0f2b
7d0f2b
* Fri May 25 2012 Neal Becker <ndbecker2@gmail.com> - 2.2.1-2
7d0f2b
- Add certs.rc
7d0f2b
7d0f2b
* Fri May  4 2012 Neal Becker <ndbecker2@gmail.com> - 2.2.1-1
7d0f2b
- update to 2.2.1
7d0f2b
7d0f2b
* Wed May  2 2012 Neal Becker <ndbecker2@gmail.com> - 2.2-1
7d0f2b
- Update to 2.2
7d0f2b
7d0f2b
* Fri Apr  6 2012 Neal Becker <ndbecker2@gmail.com> - 2.1.2-1
7d0f2b
- Update to 2.1.2
7d0f2b
7d0f2b
* Sat Mar 10 2012 Neal Becker <ndbecker2@gmail.com> - 2.1.1-1
7d0f2b
- Update to 2.1.1
7d0f2b
7d0f2b
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-2
7d0f2b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
7d0f2b
7d0f2b
* Sun Jan  1 2012 Neal Becker <ndbecker2@gmail.com> - 2.0.2-1
7d0f2b
- Update to 2.0.2
7d0f2b
7d0f2b
* Wed Nov 16 2011 Neal Becker <ndbecker2@gmail.com> - 2.0-1
7d0f2b
- Update to 2.0
7d0f2b
7d0f2b
* Tue Oct 11 2011 Neal Becker <ndbecker2@gmail.com> - 1.9.3-2
7d0f2b
- Fix br 744931 (unowned dir)
7d0f2b
7d0f2b
* Sun Oct  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.9.3-1
7d0f2b
- update to 1.9.3
7d0f2b
7d0f2b
* Sat Aug 27 2011 Neal Becker <ndbecker2@gmail.com> - 1.9.2-1
7d0f2b
- Update to 1.9.2
7d0f2b
7d0f2b
* Wed Aug  3 2011 Neal Becker <ndbecker2@gmail.com> - 1.9.1-1
7d0f2b
- Update to 1.9.1
7d0f2b
7d0f2b
* Fri Jul  1 2011 Neal Becker <ndbecker2@gmail.com> - 1.9-2
7d0f2b
- Remove docutils patch
7d0f2b
7d0f2b
* Fri Jul  1 2011 Neal Becker <ndbecker2@gmail.com> - 1.9-1
7d0f2b
- Update to 1.9
7d0f2b
7d0f2b
* Thu Jun  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.4-2
7d0f2b
- Add docutils-0.8 patch
7d0f2b
7d0f2b
* Wed Jun  1 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.4-1
7d0f2b
- Update to 1.8.4
7d0f2b
7d0f2b
* Sat Apr  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.2-1
7d0f2b
- update to 1.8.2
7d0f2b
7d0f2b
* Mon Mar 14 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.1-2
7d0f2b
- Try BR emacs-nox
7d0f2b
7d0f2b
* Mon Mar 14 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.1-1
7d0f2b
- Update to 1.8.1
7d0f2b
7d0f2b
* Wed Mar  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.8-1
7d0f2b
- Update to 1.8
7d0f2b
7d0f2b
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.5-2
7d0f2b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
7d0f2b
7d0f2b
* Sat Feb  5 2011 Neal Becker <ndbecker2@gmail.com> - 1.7.5-1
7d0f2b
- Update to 1.7.5
7d0f2b
7d0f2b
* Sun Jan  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.7.3-1
7d0f2b
- Update to 1.7.3
7d0f2b
7d0f2b
* Thu Dec  2 2010 Neal Becker <ndbecker2@gmail.com> - 1.7.2-1
7d0f2b
- Update to 1.7.2
7d0f2b
7d0f2b
* Mon Nov 15 2010 Neal Becker <ndbecker2@gmail.com> - 1.7.1-1
7d0f2b
- Update to 1.7.1
7d0f2b
7d0f2b
* Mon Nov  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.7-3
7d0f2b
- BR python-docutils
7d0f2b
7d0f2b
* Mon Nov  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.7-2
7d0f2b
- Make that 1.7
7d0f2b
7d0f2b
* Mon Nov  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.7.0-1
7d0f2b
- Update to 1.7.0
7d0f2b
7d0f2b
* Thu Oct 21 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.4-4
7d0f2b
- Try another way to own directories
7d0f2b
7d0f2b
* Wed Oct 20 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.4-3
7d0f2b
- Fixup unowned directories
7d0f2b
7d0f2b
* Wed Oct  6 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.4-3
7d0f2b
- patch i18n.py so hg will find moved locale files
7d0f2b
7d0f2b
* Fri Oct  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.4-1
7d0f2b
- Update to 1.6.4
7d0f2b
7d0f2b
* Fri Aug 27 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.3-1
7d0f2b
- Fix some rpmlint issues
7d0f2b
7d0f2b
* Thu Aug 26 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.3-1
7d0f2b
- Update to 1.6.3
7d0f2b
7d0f2b
* Mon Aug  2 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.2-1
7d0f2b
- Update to 1.6.2
7d0f2b
7d0f2b
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 1.6-4
7d0f2b
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
7d0f2b
7d0f2b
* Sun Jul  4 2010 Neal Becker <ndbecker2@gmail.com> - 1.6-2
7d0f2b
- Remove hg-viz, git-rev-tree
7d0f2b
7d0f2b
* Sun Jul  4 2010 Neal Becker <ndbecker2@gmail.com> - 1.6-1
7d0f2b
- Update to 1.6
7d0f2b
- git-viz is removed
7d0f2b
7d0f2b
* Fri Jun 25 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.4-1
7d0f2b
- Don't install mercurial-convert-repo (use hg convert instead)
7d0f2b
7d0f2b
* Wed Jun  2 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.4-1
7d0f2b
- Update to 1.5.4
7d0f2b
7d0f2b
* Fri May 14 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.3-1
7d0f2b
- Update to 1.5.3
7d0f2b
7d0f2b
* Mon May  3 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.2-1
7d0f2b
- update to 1.5.2
7d0f2b
7d0f2b
* Mon Apr  5 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.1-1
7d0f2b
- Update to 1.5.1
7d0f2b
7d0f2b
* Sat Mar  6 2010 Neal Becker <ndbecker2@gmail.com> - 1.5-2
7d0f2b
- doc/ja seems to be gone
7d0f2b
7d0f2b
* Sat Mar  6 2010 Neal Becker <ndbecker2@gmail.com> - 1.5-1
7d0f2b
- Update to 1.5
7d0f2b
7d0f2b
* Fri Feb  5 2010 Neal Becker <ndbecker2@gmail.com> - 1.4.3-2
7d0f2b
- License changed to gplv2+
7d0f2b
7d0f2b
* Mon Feb  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.4.3-1
7d0f2b
- Update to 1.4.3
7d0f2b
7d0f2b
* Sat Jan  2 2010 Neal Becker <ndbecker2@gmail.com> - 1.4.2-1
7d0f2b
- Update to 1.4.2
7d0f2b
7d0f2b
* Wed Dec  2 2009 Neal Becker <ndbecker2@gmail.com> - 1.4.1-1
7d0f2b
- Update to 1.4.1
7d0f2b
7d0f2b
* Mon Nov 16 2009 Neal Becker <ndbecker2@gmail.com> - 1.4-1.1
7d0f2b
- Bump to 1.4-1.1
7d0f2b
7d0f2b
* Mon Nov 16 2009 Neal Becker <ndbecker2@gmail.com> - 1.4-1
7d0f2b
- Update to 1.4
7d0f2b
7d0f2b
* Fri Jul 24 2009 Neal Becker <ndbecker2@gmail.com> - 1.3.1-3
7d0f2b
- Disable self-tests
7d0f2b
7d0f2b
* Fri Jul 24 2009 Neal Becker <ndbecker2@gmail.com> - 1.3.1-2
7d0f2b
- Update to 1.3.1
7d0f2b
7d0f2b
* Wed Jul  1 2009 Neal Becker <ndbecker2@gmail.com> - 1.3-2
7d0f2b
- Re-enable tests since they now pass
7d0f2b
7d0f2b
* Wed Jul  1 2009 Neal Becker <ndbecker2@gmail.com> - 1.3-1
7d0f2b
- Update to 1.3
7d0f2b
7d0f2b
* Sat Mar 21 2009 Neal Becker <ndbecker2@gmail.com> - 1.2.1-1
7d0f2b
- Update to 1.2.1
7d0f2b
- Tests remain disabled due to failures
7d0f2b
7d0f2b
* Wed Mar  4 2009 Neal Becker <ndbecker2@gmail.com> - 1.2-2
7d0f2b
- patch0 for filemerge bug should not be needed
7d0f2b
7d0f2b
* Wed Mar  4 2009 Neal Becker <ndbecker2@gmail.com> - 1.2-1
7d0f2b
- Update to 1.2
7d0f2b
7d0f2b
* Tue Feb 24 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-7
7d0f2b
- Use noreplace option on config
7d0f2b
7d0f2b
* Mon Feb 23 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-6
7d0f2b
- Fix typo
7d0f2b
7d0f2b
* Mon Feb 23 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-5
7d0f2b
- Own directories bash_completion.d and zsh/site-functions
7d0f2b
  https://bugzilla.redhat.com/show_bug.cgi?id=487015
7d0f2b
7d0f2b
* Mon Feb  9 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-4
7d0f2b
- Mark mergetools.rc as config
7d0f2b
7d0f2b
* Sat Feb  7 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-3
7d0f2b
- Patch mergetools.rc to fix filemerge bug
7d0f2b
7d0f2b
* Thu Jan  1 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-2
7d0f2b
- Rename mergetools.rc -> mergetools.rc.sample
7d0f2b
7d0f2b
* Thu Jan  1 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-1
7d0f2b
- Update to 1.1.2
7d0f2b
7d0f2b
* Wed Dec 24 2008 Neal Becker <ndbecker2@gmail.com> - 1.1.1-3
7d0f2b
- Install mergetools.rc as mergetools.rc.sample
7d0f2b
7d0f2b
* Sun Dec 21 2008 Neal Becker <ndbecker2@gmail.com> - 1.1.1-2
7d0f2b
- Fix typo
7d0f2b
7d0f2b
* Sun Dec 21 2008 Neal Becker <ndbecker2@gmail.com> - 1.1.1-1
7d0f2b
- Update to 1.1.1
7d0f2b
7d0f2b
* Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.1-2
7d0f2b
- Rebuild for Python 2.6
7d0f2b
7d0f2b
* Tue Dec  2 2008 Neal Becker <ndbecker2@gmail.com> - 1.1-1
7d0f2b
- Update to 1.1
7d0f2b
7d0f2b
* Mon Dec  1 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.2-4
7d0f2b
- Bump tag
7d0f2b
7d0f2b
* Mon Dec  1 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.2-3
7d0f2b
- Remove BR asciidoc
7d0f2b
- Use macro for python executable
7d0f2b
7d0f2b
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.0.2-2
7d0f2b
- Rebuild for Python 2.6
7d0f2b
7d0f2b
* Fri Aug 15 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.2-1
7d0f2b
- Update to 1.0.2
7d0f2b
7d0f2b
* Sun Jun 15 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.1-4
7d0f2b
- Bitten by expansion of commented out macro (again)
7d0f2b
7d0f2b
* Sun Jun 15 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.1-3
7d0f2b
- Add BR pkgconfig
7d0f2b
7d0f2b
* Sun Jun 15 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.1-2
7d0f2b
- Update to 1.0.1
7d0f2b
- Fix emacs_version, etc macros (need expand)
7d0f2b
- Remove patch0
7d0f2b
7d0f2b
* Mon Jun  2 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-15
7d0f2b
- Bump release tag
7d0f2b
7d0f2b
* Thu Apr 17 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-14
7d0f2b
- Oops, fix %%files due to last change
7d0f2b
7d0f2b
* Wed Apr 16 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-13
7d0f2b
- install mergetools.hgrc as mergetools.rc
7d0f2b
7d0f2b
* Sat Apr 12 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-12
7d0f2b
- Remove xemacs pkg - this is moved to xemacs-extras
7d0f2b
- Own %{python_sitearch}/{mercurial,hgext} dirs
7d0f2b
7d0f2b
* Thu Apr 10 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-11
7d0f2b
- Use install -p to install .el{c} files
7d0f2b
- Don't (load mercurial) by default.
7d0f2b
7d0f2b
* Wed Apr  9 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-10
7d0f2b
- Patch to hgk from Mads Kiilerich <mads@kiilerich.com>
7d0f2b
7d0f2b
* Tue Apr  8 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-9
7d0f2b
- Add '-l mercurial.el' for emacs also
7d0f2b
7d0f2b
* Tue Apr  8 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-8
7d0f2b
- BR xemacs-packages-extra
7d0f2b
7d0f2b
* Tue Apr  8 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-7
7d0f2b
- Various fixes
7d0f2b
7d0f2b
* Tue Apr  8 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-6
7d0f2b
- fix to comply with emacs packaging guidelines
7d0f2b
7d0f2b
* Thu Mar 27 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-5
7d0f2b
- Move hgk-related py files to hgk
7d0f2b
- Put mergetools.hgrc in /etc/mercurial/hgrc.d
7d0f2b
- Add hgk.rc and put in /etc/mercurial/hgrc.d
7d0f2b
7d0f2b
* Wed Mar 26 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-4
7d0f2b
- Rename mercurial-site-start -> mercurial-site-start.el
7d0f2b
7d0f2b
* Wed Mar 26 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-3
7d0f2b
- Incorprate suggestions from hopper@omnifarious.org
7d0f2b
7d0f2b
* Wed Mar 26 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-2
7d0f2b
- Add site-start
7d0f2b
7d0f2b
* Tue Mar 25 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-1
7d0f2b
- Update to 1.0
7d0f2b
- Disable check for now - 1 test fails
7d0f2b
- Move emacs to separate package
7d0f2b
- Add check
7d0f2b
7d0f2b
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.5-7
7d0f2b
- Autorebuild for GCC 4.3
7d0f2b
7d0f2b
* Fri Nov  9 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-6
7d0f2b
- rpmlint fixes
7d0f2b
7d0f2b
* Fri Nov  9 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-5
7d0f2b
- /etc/mercurial/hgrc.d missing
7d0f2b
7d0f2b
* Fri Nov  9 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-3
7d0f2b
- Fix to last change
7d0f2b
7d0f2b
* Fri Nov  9 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-2
7d0f2b
- mkdir /etc/mercurial/hgrc.d for plugins
7d0f2b
7d0f2b
* Tue Oct 23 2007  <ndbecker2@gmail.com> - 0.9.5-2
7d0f2b
- Bump tag to fix confusion
7d0f2b
7d0f2b
* Mon Oct 15 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-1
7d0f2b
- Sync with spec file from mercurial
7d0f2b
7d0f2b
* Sat Sep 22 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-8
7d0f2b
- Just cp contrib tree.
7d0f2b
- Revert install -O2
7d0f2b
7d0f2b
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-7
7d0f2b
- Change setup.py install to -O2 to get bytecompile on EL-4
7d0f2b
7d0f2b
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-6
7d0f2b
- Revert last change.
7d0f2b
7d0f2b
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-5
7d0f2b
- Use {ghost} on contrib, otherwise EL-4 build fails
7d0f2b
7d0f2b
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-4
7d0f2b
- remove {_datadir}/contrib stuff for now
7d0f2b
7d0f2b
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-3
7d0f2b
- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
7d0f2b
7d0f2b
* Wed Aug 29 2007 Jonathan Shapiro <shap@eros-os.com> - 0.9.4-2
7d0f2b
- update to 0.9.4-2
7d0f2b
- install contrib directory
7d0f2b
- set up required path for hgk
7d0f2b
- install man5 man pages
7d0f2b
7d0f2b
* Thu Aug 23 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-1
7d0f2b
- update to 0.9.4
7d0f2b
7d0f2b
* Wed Jan  3 2007 Jeremy Katz <katzj@redhat.com> - 0.9.3-1
7d0f2b
- update to 0.9.3
7d0f2b
- remove asciidoc files now that we have them as manpages
7d0f2b
7d0f2b
* Mon Dec 11 2006 Jeremy Katz <katzj@redhat.com> - 0.9.2-1
7d0f2b
- update to 0.9.2
7d0f2b
7d0f2b
* Mon Aug 28 2006 Jeremy Katz <katzj@redhat.com> - 0.9.1-2
7d0f2b
- rebuild
7d0f2b
7d0f2b
* Tue Jul 25 2006 Jeremy Katz <katzj@redhat.com> - 0.9.1-1
7d0f2b
- update to 0.9.1
7d0f2b
7d0f2b
* Fri May 12 2006 Mihai Ibanescu <misa@redhat.com> - 0.9-1
7d0f2b
- update to 0.9
7d0f2b
7d0f2b
* Mon Apr 10 2006 Jeremy Katz <katzj@redhat.com> - 0.8.1-1
7d0f2b
- update to 0.8.1
7d0f2b
- add man pages (#188144)
7d0f2b
7d0f2b
* Fri Mar 17 2006 Jeremy Katz <katzj@redhat.com> - 0.8-3
7d0f2b
- rebuild
7d0f2b
7d0f2b
* Fri Feb 17 2006 Jeremy Katz <katzj@redhat.com> - 0.8-2
7d0f2b
- rebuild
7d0f2b
7d0f2b
* Mon Jan 30 2006 Jeremy Katz <katzj@redhat.com> - 0.8-1
7d0f2b
- update to 0.8
7d0f2b
7d0f2b
* Thu Sep 22 2005 Jeremy Katz <katzj@redhat.com> 
7d0f2b
- add contributors to %%doc
7d0f2b
7d0f2b
* Tue Sep 20 2005 Jeremy Katz <katzj@redhat.com> - 0.7
7d0f2b
- update to 0.7
7d0f2b
7d0f2b
* Mon Aug 22 2005 Jeremy Katz <katzj@redhat.com> - 0.6c
7d0f2b
- update to 0.6c
7d0f2b
7d0f2b
* Tue Jul 12 2005 Jeremy Katz <katzj@redhat.com> - 0.6b
7d0f2b
- update to new upstream 0.6b
7d0f2b
7d0f2b
* Fri Jul  1 2005 Jeremy Katz <katzj@redhat.com> - 0.6-1
7d0f2b
- Initial build.
7d0f2b