733dfe8
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
733dfe8
3a5b154
Summary: Mercurial -- a distributed SCM
6fb3ece
Name: mercurial
88e0b13
Version: 2.6.3
f5342d3
Release: 2%{?dist}
9d9f80a
#Release: 1.rc1%{?dist}
Neal Becker 39baad4
9d9f80a
#%define upstreamversion %{version}-rc
9d9f80a
%define upstreamversion %{version}
Neal Becker 39baad4
0dd2f6e
License: GPLv2+
6fb3ece
Group: Development/Tools
6fb3ece
URL: http://www.selenic.com/mercurial/
Neal Becker 39baad4
#Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
Neal Becker 39baad4
Source0: http://www.selenic.com/mercurial/release/%{name}-%{upstreamversion}.tar.gz
5e35fe9
Source1: mercurial-site-start.el
0a9c455
Patch0: mercurial-i18n.patch
af82303
#Patch1: docutils-0.8.patch
6fb3ece
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
7d0b94e
BuildRequires: python python-devel
6290479
BuildRequires: emacs-nox emacs-el pkgconfig gettext python-docutils
a3a46f9
Requires: python
Seth Vidal 3d2fa8c
Provides: hg = %{version}-%{release}
6fb3ece
6fb3ece
%description
a3a46f9
Mercurial is a fast, lightweight source control management system designed
6fb3ece
for efficient handling of very large distributed projects.
a3a46f9
5e35fe9
Quick start: http://www.selenic.com/mercurial/wiki/index.cgi/QuickStart
5e35fe9
Tutorial: http://www.selenic.com/mercurial/wiki/index.cgi/Tutorial
5e35fe9
Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
5e35fe9
adcde5c
%define pkg mercurial
adcde5c
adcde5c
# If the emacs-el package has installed a pkgconfig file, use that to determine
adcde5c
# install locations and Emacs version at build time, otherwise set defaults.
adcde5c
%if %($(pkg-config emacs) ; echo $?)
adcde5c
%define emacs_version 22.1
adcde5c
%define emacs_lispdir %{_datadir}/emacs/site-lisp
adcde5c
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
adcde5c
%else
add71ed
%define emacs_version %{expand:%(pkg-config emacs --modversion)}
add71ed
%define emacs_lispdir %{expand:%(pkg-config emacs --variable sitepkglispdir)}
add71ed
%define emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)}
adcde5c
%endif
adcde5c
adcde5c
%package -n emacs-%{pkg}
0002e3e
Summary:	Mercurial version control system support for Emacs
0002e3e
Group:		Applications/Editors
0002e3e
Requires:	hg = %{version}-%{release}, emacs-common
adcde5c
Requires:       emacs(bin) >= %{emacs_version}
a0695b4
Obsoletes:	%{pkg}-emacs
adcde5c
adcde5c
%description -n emacs-%{pkg}
adcde5c
Contains byte compiled elisp packages for %{pkg}.
adcde5c
To get started: start emacs, load hg-mode with M-x hg-mode, and show 
adcde5c
help with C-c h h
adcde5c
adcde5c
%package -n emacs-%{pkg}-el
adcde5c
Summary:        Elisp source files for %{pkg} under GNU Emacs
a0695b4
Group:          Applications/Editors
adcde5c
Requires:       emacs-%{pkg} = %{version}-%{release}
adcde5c
adcde5c
%description -n emacs-%{pkg}-el
a6bb01d
This package contains the elisp source files for %{pkg} under GNU Emacs.
adcde5c
0002e3e
%package hgk
0002e3e
Summary:	Hgk interface for mercurial
0002e3e
Group:		Development/Tools
0002e3e
Requires:	hg = %{version}-%{release}, tk
0002e3e
adcde5c
0002e3e
%description hgk
5e35fe9
A Mercurial extension for displaying the change history graphically
5e35fe9
using Tcl/Tk.  Displays branches and merges in an easily
5e35fe9
understandable way and shows diffs for each revision.  Based on
5e35fe9
gitk for the git SCM.
5e35fe9
19135c3
Adds the "hg view" command.  See 
19135c3
http://www.selenic.com/mercurial/wiki/index.cgi/UsingHgk for more
5e35fe9
documentation.
0002e3e
6fb3ece
%prep
Neal Becker 379b946
#%setup -q
Neal Becker 379b946
%setup -q -n %{name}-%{upstreamversion}
0a9c455
%patch0 -p0
af82303
#%patch1 -p1
6fb3ece
6fb3ece
%build
a3a46f9
make all
c68158f
6fb3ece
%install
795ef7d
rm -rf $RPM_BUILD_ROOT
7d0b94e
%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --prefix %{_prefix} --record=%{name}.files
a3a46f9
make install-doc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
a3a46f9
15e5576
grep -v -e 'hgk.py*' -e %{python_sitearch}/mercurial/ -e %{python_sitearch}/hgext/ < %{name}.files > %{name}-base.files
adcde5c
grep 'hgk.py*' < %{name}.files > %{name}-hgk.files
adcde5c
3a5b154
install -D -m 755 contrib/hgk       $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk
3a5b154
install -m 755 contrib/hg-ssh       $RPM_BUILD_ROOT%{_bindir}
a3a46f9
a3a46f9
bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
a3a46f9
mkdir -p $bash_completion_dir
a3a46f9
install -m 644 contrib/bash_completion $bash_completion_dir/mercurial.sh
a3a46f9
a3a46f9
zsh_completion_dir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
a3a46f9
mkdir -p $zsh_completion_dir
a3a46f9
install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial
a3a46f9
adcde5c
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
733dfe8
adcde5c
pushd contrib
adcde5c
for file in mercurial.el mq.el; do
434c35b
  #emacs -batch -l mercurial.el --no-site-file -f batch-byte-compile $file
434c35b
  %{_emacs_bytecompile} $file
db6d8de
  install -p -m 644 $file ${file}c $RPM_BUILD_ROOT%{emacs_lispdir}
adcde5c
  rm ${file}c
adcde5c
done
adcde5c
popd
adcde5c
adcde5c
adcde5c
eedf521
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
6fb3ece
adcde5c
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} && install -m644 %SOURCE1 $RPM_BUILD_ROOT%{emacs_startdir}
adcde5c
adcde5c
cat >hgk.rc <
adcde5c
[extensions]
adcde5c
# enable hgk extension ('hg help' shows 'view' as a command)
adcde5c
hgk=
19135c3
19135c3
[hgk]
19135c3
path=%{_libexecdir}/mercurial/hgk
adcde5c
EOF
3a5b154
install -m 644 hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
adcde5c
99d7010
cat > certs.rc <
b5d43bd
# see: http://mercurial.selenic.com/wiki/CACertificates
99d7010
[web]
99d7010
cacerts = /etc/pki/tls/certs/ca-bundle.crt
99d7010
EOF
99d7010
install -m 644 certs.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
99d7010
3a5b154
install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
8d4a395
3f69f4d
mv $RPM_BUILD_ROOT%{python_sitearch}/mercurial/locale $RPM_BUILD_ROOT%{_datadir}/locale
0a9c455
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/mercurial/locale
0a9c455
3f69f4d
3f69f4d
%find_lang hg
3f69f4d
3f69f4d
grep -v locale %{name}-base.files > %{name}-base-filtered.files
3f69f4d
6fb3ece
%clean
6fb3ece
rm -rf $RPM_BUILD_ROOT
6fb3ece
8f92c19
%files -f %{name}-base-filtered.files -f hg.lang
6fb3ece
%defattr(-,root,root,-)
c880ad4
%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi contrib/*.wsgi
a3a46f9
%doc %attr(644,root,root) %{_mandir}/man?/hg*.gz
adcde5c
%doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
3a5b154
%config(noreplace) %{_sysconfdir}/bash_completion.d/mercurial.sh
a3a46f9
%{_datadir}/zsh/site-functions/_mercurial
a3a46f9
%{_bindir}/hg-ssh
d53bc13
%dir %{_sysconfdir}/bash_completion.d/
7abb7b6
%dir %{_datadir}/zsh/
7abb7b6
%{_datadir}/zsh/site-functions/
04ef41f
%dir %{_sysconfdir}/mercurial
3bceaf6
%dir %{_sysconfdir}/mercurial/hgrc.d
15e5576
%{python_sitearch}/mercurial
15e5576
%{python_sitearch}/hgext
13f9070
%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
00a5d94
%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/certs.rc
adcde5c
adcde5c
%files -n emacs-%{pkg}
3a5b154
%defattr(-,root,root,-)
adcde5c
%{emacs_lispdir}/*.elc
adcde5c
%{emacs_startdir}/*.el
6fb3ece
adcde5c
%files -n emacs-%{pkg}-el
3a5b154
%defattr(-,root,root,-)
adcde5c
%{emacs_lispdir}/*.el
0002e3e
adcde5c
%files hgk -f %{name}-hgk.files
3a5b154
%defattr(-,root,root,-)
19135c3
%{_libexecdir}/mercurial/
adcde5c
%{_sysconfdir}/mercurial/hgrc.d/hgk.rc
0002e3e
8b12dff
##%%check
8b12dff
##cd tests && %{__python} run-tests.py
0002e3e
6fb3ece
%changelog
f5342d3
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.3-2
f5342d3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
f5342d3
88e0b13
* Mon Jul  8 2013 nbecker <ndbecker2@gmail.com> - 2.6.3-1
88e0b13
- Update to 2.6.3
88e0b13
2252e88
1954e17
* Thu Jun 6 2013 nbecker <ndbecker2@gmail.com> - 2.6.2-1
2252e88
- Update to 2.6.2
2252e88
4dec3c6
* Wed May  8 2013 nbecker <ndbecker2@gmail.com> - 2.6-1
4dec3c6
- Update to 2.6
4dec3c6
c880ad4
* Mon Mar 18 2013 nbecker <ndbecker2@gmail.com> - 2.5.2-2
c880ad4
- Add hgweb.wsgi
c880ad4
afe46c4
* Sat Mar  2 2013 nbecker <ndbecker2@gmail.com> - 2.5.2-1
afe46c4
- Update to 2.5.2
afe46c4
f747f11
* Sat Feb  9 2013 Neal Becker <ndbecker2@gmail.com> - 2.5.1-1
f747f11
- Update to 2.5.1
f747f11
19d02a5
* Tue Feb  5 2013 Neal Becker <ndbecker2@gmail.com> - 2.5-1
19d02a5
- Update to 2.5
19d02a5
8615862
* Sun Dec 16 2012 Neal Becker <ndbecker2@gmail.com> - 2.4.1-1
8615862
- Update to 2.4.1
8615862
edc5312
* Sun Nov  4 2012 Neal Becker <ndbecker2@gmail.com> - 2.4-1
edc5312
- Update to 2.4
edc5312
82aa4a4
* Wed Sep  5 2012 Neal Becker <ndbecker2@gmail.com> - 2.3.1-1
82aa4a4
- Update to 2.3.1
82aa4a4
9bf375f
* Mon Aug 13 2012 Neal Becker <ndbecker2@gmail.com> - 2.3-1
9bf375f
- Update to 2.3
9bf375f
9cceb88
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.3-2
9cceb88
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
9cceb88
4cef611
* Mon Jul  9 2012 Neal Becker <ndbecker2@gmail.com> - 2.2.3-1
4cef611
- Update to 2.2.3
4cef611
5d95ed0
* Sun Jun  3 2012 Neal Becker <ndbecker2@gmail.com> - 2.2.2-1
5d95ed0
- Update to 2.2.2
5d95ed0
99d7010
* Fri May 25 2012 Neal Becker <ndbecker2@gmail.com> - 2.2.1-2
99d7010
- Add certs.rc
99d7010
721ebb8
* Fri May  4 2012 Neal Becker <ndbecker2@gmail.com> - 2.2.1-1
721ebb8
- update to 2.2.1
721ebb8
69314a0
* Wed May  2 2012 Neal Becker <ndbecker2@gmail.com> - 2.2-1
69314a0
- Update to 2.2
69314a0
05d0501
* Fri Apr  6 2012 Neal Becker <ndbecker2@gmail.com> - 2.1.2-1
05d0501
- Update to 2.1.2
05d0501
f6417b1
* Sat Mar 10 2012 Neal Becker <ndbecker2@gmail.com> - 2.1.1-1
f6417b1
- Update to 2.1.1
f6417b1
a129645
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-2
a129645
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
a129645
Neal Becker 9e9df11
* Sun Jan  1 2012 Neal Becker <ndbecker2@gmail.com> - 2.0.2-1
Neal Becker 9e9df11
- Update to 2.0.2
Neal Becker 9e9df11
Neal Becker 9a17d8c
* Wed Nov 16 2011 Neal Becker <ndbecker2@gmail.com> - 2.0-1
Neal Becker 9a17d8c
- Update to 2.0
Neal Becker 9a17d8c
7abb7b6
* Tue Oct 11 2011 Neal Becker <ndbecker2@gmail.com> - 1.9.3-2
7abb7b6
- Fix br 744931 (unowned dir)
7abb7b6
6168dac
* Sun Oct  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.9.3-1
6168dac
- update to 1.9.3
6168dac
493afb2
* Sat Aug 27 2011 Neal Becker <ndbecker2@gmail.com> - 1.9.2-1
493afb2
- Update to 1.9.2
493afb2
312531c
* Wed Aug  3 2011 Neal Becker <ndbecker2@gmail.com> - 1.9.1-1
312531c
- Update to 1.9.1
312531c
af82303
* Fri Jul  1 2011 Neal Becker <ndbecker2@gmail.com> - 1.9-2
af82303
- Remove docutils patch
af82303
17a5652
* Fri Jul  1 2011 Neal Becker <ndbecker2@gmail.com> - 1.9-1
17a5652
- Update to 1.9
17a5652
bdb6aef
* Thu Jun  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.4-2
bdb6aef
- Add docutils-0.8 patch
bdb6aef
cd1aebc
* Wed Jun  1 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.4-1
cd1aebc
- Update to 1.8.4
cd1aebc
4b1339e
* Sat Apr  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.2-1
4b1339e
- update to 1.8.2
4b1339e
6290479
* Mon Mar 14 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.1-2
6290479
- Try BR emacs-nox
6290479
8d8ca20
* Mon Mar 14 2011 Neal Becker <ndbecker2@gmail.com> - 1.8.1-1
8d8ca20
- Update to 1.8.1
8d8ca20
bd336b6
* Wed Mar  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.8-1
bd336b6
- Update to 1.8
bd336b6
c49cfca
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.5-2
c49cfca
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
c49cfca
05e7c58
* Sat Feb  5 2011 Neal Becker <ndbecker2@gmail.com> - 1.7.5-1
05e7c58
- Update to 1.7.5
05e7c58
42cbfe3
* Sun Jan  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.7.3-1
42cbfe3
- Update to 1.7.3
42cbfe3
9272930
* Thu Dec  2 2010 Neal Becker <ndbecker2@gmail.com> - 1.7.2-1
9272930
- Update to 1.7.2
9272930
51f1117
* Mon Nov 15 2010 Neal Becker <ndbecker2@gmail.com> - 1.7.1-1
51f1117
- Update to 1.7.1
51f1117
f14a596
* Mon Nov  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.7-3
f14a596
- BR python-docutils
f14a596
1fecbaf
* Mon Nov  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.7-2
1fecbaf
- Make that 1.7
1fecbaf
a6e3220
* Mon Nov  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.7.0-1
a6e3220
- Update to 1.7.0
a6e3220
15e5576
* Thu Oct 21 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.4-4
15e5576
- Try another way to own directories
15e5576
8f92c19
* Wed Oct 20 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.4-3
8f92c19
- Fixup unowned directories
8f92c19
7949d0b
* Wed Oct  6 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.4-3
7949d0b
- patch i18n.py so hg will find moved locale files
7949d0b
e558705
* Fri Oct  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.4-1
e558705
- Update to 1.6.4
e558705
a6bb01d
* Fri Aug 27 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.3-1
a6bb01d
- Fix some rpmlint issues
a6bb01d
397992d
* Thu Aug 26 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.3-1
397992d
- Update to 1.6.3
397992d
Neal Becker 133e7b7
* Mon Aug  2 2010 Neal Becker <ndbecker2@gmail.com> - 1.6.2-1
Neal Becker 133e7b7
- Update to 1.6.2
Neal Becker 133e7b7
f4b4300
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 1.6-4
f4b4300
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
f4b4300
c6385fc
* Sun Jul  4 2010 Neal Becker <ndbecker2@gmail.com> - 1.6-2
c6385fc
- Remove hg-viz, git-rev-tree
c6385fc
334b83f
* Sun Jul  4 2010 Neal Becker <ndbecker2@gmail.com> - 1.6-1
334b83f
- Update to 1.6
dd47557
- git-viz is removed
334b83f
334b83f
* Fri Jun 25 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.4-1
334b83f
- Don't install mercurial-convert-repo (use hg convert instead)
334b83f
29fbc85
* Wed Jun  2 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.4-1
29fbc85
- Update to 1.5.4
29fbc85
4e98401
* Fri May 14 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.3-1
4e98401
- Update to 1.5.3
4e98401
4045859
* Mon May  3 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.2-1
4045859
- update to 1.5.2
4045859
8c3ca11
* Mon Apr  5 2010 Neal Becker <ndbecker2@gmail.com> - 1.5.1-1
8c3ca11
- Update to 1.5.1
8c3ca11
13cd2b4
* Sat Mar  6 2010 Neal Becker <ndbecker2@gmail.com> - 1.5-2
13cd2b4
- doc/ja seems to be gone
13cd2b4
0dd2f6e
* Sat Mar  6 2010 Neal Becker <ndbecker2@gmail.com> - 1.5-1
0dd2f6e
- Update to 1.5
0dd2f6e
0dd2f6e
* Fri Feb  5 2010 Neal Becker <ndbecker2@gmail.com> - 1.4.3-2
0dd2f6e
- License changed to gplv2+
0dd2f6e
67a31e3
* Mon Feb  1 2010 Neal Becker <ndbecker2@gmail.com> - 1.4.3-1
67a31e3
- Update to 1.4.3
67a31e3
4a28d0f
* Sat Jan  2 2010 Neal Becker <ndbecker2@gmail.com> - 1.4.2-1
4a28d0f
- Update to 1.4.2
4a28d0f
8d2c898
* Wed Dec  2 2009 Neal Becker <ndbecker2@gmail.com> - 1.4.1-1
8d2c898
- Update to 1.4.1
8d2c898
8d2c898
* Mon Nov 16 2009 Neal Becker <ndbecker2@gmail.com> - 1.4-1.1
8d2c898
- Bump to 1.4-1.1
8d2c898
228cc88
* Mon Nov 16 2009 Neal Becker <ndbecker2@gmail.com> - 1.4-1
228cc88
- Update to 1.4
228cc88
8b12dff
* Fri Jul 24 2009 Neal Becker <ndbecker2@gmail.com> - 1.3.1-3
8b12dff
- Disable self-tests
8b12dff
5511936
* Fri Jul 24 2009 Neal Becker <ndbecker2@gmail.com> - 1.3.1-2
5511936
- Update to 1.3.1
5511936
53eee81
* Wed Jul  1 2009 Neal Becker <ndbecker2@gmail.com> - 1.3-2
53eee81
- Re-enable tests since they now pass
53eee81
5246564
* Wed Jul  1 2009 Neal Becker <ndbecker2@gmail.com> - 1.3-1
5246564
- Update to 1.3
5246564
1323632
* Sat Mar 21 2009 Neal Becker <ndbecker2@gmail.com> - 1.2.1-1
1323632
- Update to 1.2.1
4e35654
- Tests remain disabled due to failures
1323632
72340f9
* Wed Mar  4 2009 Neal Becker <ndbecker2@gmail.com> - 1.2-2
72340f9
- patch0 for filemerge bug should not be needed
72340f9
4c4848f
* Wed Mar  4 2009 Neal Becker <ndbecker2@gmail.com> - 1.2-1
4c4848f
- Update to 1.2
4c4848f
13f9070
* Tue Feb 24 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-7
13f9070
- Use noreplace option on config
13f9070
d53bc13
* Mon Feb 23 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-6
d53bc13
- Fix typo
d53bc13
641e372
* Mon Feb 23 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-5
641e372
- Own directories bash_completion.d and zsh/site-functions
641e372
  https://bugzilla.redhat.com/show_bug.cgi?id=487015
641e372
2f88f6b
* Mon Feb  9 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-4
2f88f6b
- Mark mergetools.rc as config
2f88f6b
bffcc67
* Sat Feb  7 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-3
eef0e2c
- Patch mergetools.rc to fix filemerge bug
bffcc67
118e315
* Thu Jan  1 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-2
118e315
- Rename mergetools.rc -> mergetools.rc.sample
118e315
8eeda7b
* Thu Jan  1 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-1
8eeda7b
- Update to 1.1.2
8eeda7b
8eeda7b
* Wed Dec 24 2008 Neal Becker <ndbecker2@gmail.com> - 1.1.1-3
8eeda7b
- Install mergetools.rc as mergetools.rc.sample
8eeda7b
0386a6f
* Sun Dec 21 2008 Neal Becker <ndbecker2@gmail.com> - 1.1.1-2
0386a6f
- Fix typo
0386a6f
34d8288
* Sun Dec 21 2008 Neal Becker <ndbecker2@gmail.com> - 1.1.1-1
34d8288
- Update to 1.1.1
34d8288
7b9fa21
* Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.1-2
7b9fa21
- Rebuild for Python 2.6
7b9fa21
747e4e8
* Tue Dec  2 2008 Neal Becker <ndbecker2@gmail.com> - 1.1-1
747e4e8
- Update to 1.1
747e4e8
747e4e8
* Mon Dec  1 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.2-4
747e4e8
- Bump tag
747e4e8
7d0b94e
* Mon Dec  1 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.2-3
7d0b94e
- Remove BR asciidoc
7d0b94e
- Use macro for python executable
7d0b94e
0ef9770
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.0.2-2
0ef9770
- Rebuild for Python 2.6
0ef9770
c4f92bc
* Fri Aug 15 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.2-1
c4f92bc
- Update to 1.0.2
c4f92bc
1fb68cc
* Sun Jun 15 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.1-4
1fb68cc
- Bitten by expansion of commented out macro (again)
1fb68cc
86f4ce2
* Sun Jun 15 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.1-3
86f4ce2
- Add BR pkgconfig
86f4ce2
add71ed
* Sun Jun 15 2008 Neal Becker <ndbecker2@gmail.com> - 1.0.1-2
22deae1
- Update to 1.0.1
add71ed
- Fix emacs_version, etc macros (need expand)
9fdb5b5
- Remove patch0
22deae1
22deae1
* Mon Jun  2 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-15
22deae1
- Bump release tag
22deae1
f910414
* Thu Apr 17 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-14
f910414
- Oops, fix %%files due to last change
f910414
7a98ec2
* Wed Apr 16 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-13
7a98ec2
- install mergetools.hgrc as mergetools.rc
7a98ec2
733dfe8
* Sat Apr 12 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-12
733dfe8
- Remove xemacs pkg - this is moved to xemacs-extras
733dfe8
- Own %{python_sitearch}/{mercurial,hgext} dirs
733dfe8
db6d8de
* Thu Apr 10 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-11
db6d8de
- Use install -p to install .el{c} files
db6d8de
- Don't (load mercurial) by default.
db6d8de
19135c3
* Wed Apr  9 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-10
19135c3
- Patch to hgk from Mads Kiilerich <mads@kiilerich.com>
19135c3
45fdcc1
* Tue Apr  8 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-9
45fdcc1
- Add '-l mercurial.el' for emacs also
45fdcc1
b0bf1f7
* Tue Apr  8 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-8
b0bf1f7
- BR xemacs-packages-extra
b0bf1f7
a0695b4
* Tue Apr  8 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-7
a0695b4
- Various fixes
a0695b4
adcde5c
* Tue Apr  8 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-6
adcde5c
- fix to comply with emacs packaging guidelines
adcde5c
adcde5c
* Thu Mar 27 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-5
adcde5c
- Move hgk-related py files to hgk
adcde5c
- Put mergetools.hgrc in /etc/mercurial/hgrc.d
adcde5c
- Add hgk.rc and put in /etc/mercurial/hgrc.d
adcde5c
5e35fe9
* Wed Mar 26 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-4
5e35fe9
- Rename mercurial-site-start -> mercurial-site-start.el
5e35fe9
5e35fe9
* Wed Mar 26 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-3
5e35fe9
- Incorprate suggestions from hopper@omnifarious.org
5e35fe9
8d4a395
* Wed Mar 26 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-2
8d4a395
- Add site-start
8d4a395
0002e3e
* Tue Mar 25 2008 Neal Becker <ndbecker2@gmail.com> - 1.0-1
0002e3e
- Update to 1.0
0002e3e
- Disable check for now - 1 test fails
0002e3e
- Move emacs to separate package
0002e3e
- Add check
0002e3e
3af5677
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.5-7
3af5677
- Autorebuild for GCC 4.3
3af5677
795ef7d
* Fri Nov  9 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-6
795ef7d
- rpmlint fixes
795ef7d
3bceaf6
* Fri Nov  9 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-5
3bceaf6
- /etc/mercurial/hgrc.d missing
3bceaf6
eedf521
* Fri Nov  9 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-3
eedf521
- Fix to last change
eedf521
04ef41f
* Fri Nov  9 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-2
04ef41f
- mkdir /etc/mercurial/hgrc.d for plugins
04ef41f
19a54fe
* Tue Oct 23 2007  <ndbecker2@gmail.com> - 0.9.5-2
19a54fe
- Bump tag to fix confusion
19a54fe
a3a46f9
* Mon Oct 15 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.5-1
a3a46f9
- Sync with spec file from mercurial
a3a46f9
4ff07a4
* Sat Sep 22 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-8
4ff07a4
- Just cp contrib tree.
4ff07a4
- Revert install -O2
4ff07a4
c606469
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-7
c606469
- Change setup.py install to -O2 to get bytecompile on EL-4
c606469
204edc7
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-6
204edc7
- Revert last change.
204edc7
fc904f4
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-5
795ef7d
- Use {ghost} on contrib, otherwise EL-4 build fails
fc904f4
c9cb06a
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-4
795ef7d
- remove {_datadir}/contrib stuff for now
c9cb06a
18b9e19
* Thu Sep 20 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-3
18b9e19
- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
18b9e19
18b9e19
* Wed Aug 29 2007 Jonathan Shapiro <shap@eros-os.com> - 0.9.4-2
18b9e19
- update to 0.9.4-2
18b9e19
- install contrib directory
18b9e19
- set up required path for hgk
18b9e19
- install man5 man pages
18b9e19
445b47d
* Thu Aug 23 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.4-1
445b47d
- update to 0.9.4
445b47d
5ef1bff
* Wed Jan  3 2007 Jeremy Katz <katzj@redhat.com> - 0.9.3-1
5ef1bff
- update to 0.9.3
5ef1bff
- remove asciidoc files now that we have them as manpages
5ef1bff
6bb94ce
* Mon Dec 11 2006 Jeremy Katz <katzj@redhat.com> - 0.9.2-1
6bb94ce
- update to 0.9.2
6bb94ce
3323263
* Mon Aug 28 2006 Jeremy Katz <katzj@redhat.com> - 0.9.1-2
3323263
- rebuild
3323263
f3015ae
* Tue Jul 25 2006 Jeremy Katz <katzj@redhat.com> - 0.9.1-1
f3015ae
- update to 0.9.1
f3015ae
Mihai Ibanescu f585cd2
* Fri May 12 2006 Mihai Ibanescu <misa@redhat.com> - 0.9-1
Mihai Ibanescu f585cd2
- update to 0.9
Mihai Ibanescu f585cd2
c68158f
* Mon Apr 10 2006 Jeremy Katz <katzj@redhat.com> - 0.8.1-1
c68158f
- update to 0.8.1
c68158f
- add man pages (#188144)
c68158f
3628ae8
* Fri Mar 17 2006 Jeremy Katz <katzj@redhat.com> - 0.8-3
3628ae8
- rebuild
3628ae8
df17dbf
* Fri Feb 17 2006 Jeremy Katz <katzj@redhat.com> - 0.8-2
df17dbf
- rebuild
df17dbf
d0b24d2
* Mon Jan 30 2006 Jeremy Katz <katzj@redhat.com> - 0.8-1
d0b24d2
- update to 0.8
d0b24d2
e329f72
* Thu Sep 22 2005 Jeremy Katz <katzj@redhat.com> 
e329f72
- add contributors to %%doc
e329f72
3899d86
* Tue Sep 20 2005 Jeremy Katz <katzj@redhat.com> - 0.7
3899d86
- update to 0.7
3899d86
a63102f
* Mon Aug 22 2005 Jeremy Katz <katzj@redhat.com> - 0.6c
a63102f
- update to 0.6c
a63102f
019530e
* Tue Jul 12 2005 Jeremy Katz <katzj@redhat.com> - 0.6b
019530e
- update to new upstream 0.6b
019530e
6fb3ece
* Fri Jul  1 2005 Jeremy Katz <katzj@redhat.com> - 0.6-1
6fb3ece
- Initial build.
6fb3ece