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