Mercurial > hg
annotate contrib/mercurial.spec @ 22147:9ac98c2aa95c stable
histedit: preserve initial author on fold (issue4296)
When the authorship of the changeset folded in does not match that of
the base changeset, we currently use the configured ui.username
instead. This is especially surprising when the user is not the author
of either of the changesets. In such cases, the resulting authorship
(the user's) is clearly incorrect. Even when the user is folding in a
patch they authored themselves, it's not clear whether they should
take over the authorship. Let's instead keep it simple and always
preserve the base changeset's authorship. This is also how
"git rebase -i" handles folding/squashing.
author | Martin von Zweigbergk <martinvonz@gmail.com> |
---|---|
date | Wed, 13 Aug 2014 11:50:13 -0700 |
parents | 977e5bd6eb76 |
children | 95032d2cf96f |
rev | line source |
---|---|
21639
57e0f053e529
buildrpm: collect code for building local hg and using it in one place
Mads Kiilerich <madski@unity3d.com>
parents:
21638
diff
changeset
|
1 %global emacs_lispdir %{_datadir}/emacs/site-lisp |
57e0f053e529
buildrpm: collect code for building local hg and using it in one place
Mads Kiilerich <madski@unity3d.com>
parents:
21638
diff
changeset
|
2 %global pythonver %(python -c 'import sys;print ".".join(map(str, sys.version_info[:2]))') |
57e0f053e529
buildrpm: collect code for building local hg and using it in one place
Mads Kiilerich <madski@unity3d.com>
parents:
21638
diff
changeset
|
3 |
12056
85439f43749f
mercurial.spec: specify file modes for install
Mads Kiilerich <mads@kiilerich.com>
parents:
11845
diff
changeset
|
4 Summary: A fast, lightweight Source Control Management system |
459 | 5 Name: mercurial |
3863
1ef8ada4370f
Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents:
1891
diff
changeset
|
6 Version: snapshot |
1891
e5c8e38b788f
New version/release in mercurial.spec, patchbomb is now in hgext.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1890
diff
changeset
|
7 Release: 0 |
10263 | 8 License: GPLv2+ |
459 | 9 Group: Development/Tools |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
10 URL: http://mercurial.selenic.com/ |
21641
977e5bd6eb76
buildrpm: include release version in .tar.gz name
Mads Kiilerich <madski@unity3d.com>
parents:
21639
diff
changeset
|
11 Source0: %{name}-%{version}-%{release}.tar.gz |
7424 | 12 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root |
459 | 13 |
11845
85de44ae0238
mercurial.spec: gettext is a build requirement for getting proper localization
Mads Kiilerich <mads@kiilerich.com>
parents:
11512
diff
changeset
|
14 BuildRequires: python >= 2.4, python-devel, make, gcc, python-docutils >= 0.5, gettext |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
15 Provides: hg = %{version}-%{release} |
10255
26fc868cb8b0
mercurial.spec: Alignment with AIX spec by Jim Hague
Mads Kiilerich <mads@kiilerich.com>
parents:
9635
diff
changeset
|
16 Requires: python >= 2.4 |
26fc868cb8b0
mercurial.spec: Alignment with AIX spec by Jim Hague
Mads Kiilerich <mads@kiilerich.com>
parents:
9635
diff
changeset
|
17 # The hgk extension uses the wish tcl interpreter, but we don't enforce it |
26fc868cb8b0
mercurial.spec: Alignment with AIX spec by Jim Hague
Mads Kiilerich <mads@kiilerich.com>
parents:
9635
diff
changeset
|
18 #Requires: tk |
4751 | 19 |
459 | 20 %description |
21 Mercurial is a fast, lightweight source control management system designed | |
22 for efficient handling of very large distributed projects. | |
23 | |
24 %prep | |
21641
977e5bd6eb76
buildrpm: include release version in .tar.gz name
Mads Kiilerich <madski@unity3d.com>
parents:
21639
diff
changeset
|
25 %setup -q -n mercurial-%{version}-%{release} |
459 | 26 |
27 %build | |
4753
620cea146b19
mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4752
diff
changeset
|
28 make all |
459 | 29 |
30 %install | |
7424 | 31 rm -rf $RPM_BUILD_ROOT |
11062
a2a6fd1064df
contrib/mercurial.spec: Use DESTDIR variable and 'make install'
Mads Kiilerich <mads@kiilerich.com>
parents:
11014
diff
changeset
|
32 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir} |
4753
620cea146b19
mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4752
diff
changeset
|
33 |
21638
5337cb17fa1f
buildrpm: various minor cleanup
Mads Kiilerich <madski@unity3d.com>
parents:
12056
diff
changeset
|
34 install -m 755 contrib/hgk $RPM_BUILD_ROOT%{_bindir}/ |
5337cb17fa1f
buildrpm: various minor cleanup
Mads Kiilerich <madski@unity3d.com>
parents:
12056
diff
changeset
|
35 install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}/ |
4752
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
36 |
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
37 bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d |
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
38 mkdir -p $bash_completion_dir |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
39 install -m 644 contrib/bash_completion $bash_completion_dir/mercurial.sh |
4752
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
40 |
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
41 zsh_completion_dir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions |
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
42 mkdir -p $zsh_completion_dir |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
43 install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial |
4752
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
44 |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
45 mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir} |
21638
5337cb17fa1f
buildrpm: various minor cleanup
Mads Kiilerich <madski@unity3d.com>
parents:
12056
diff
changeset
|
46 install -m 644 contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir}/ |
5337cb17fa1f
buildrpm: various minor cleanup
Mads Kiilerich <madski@unity3d.com>
parents:
12056
diff
changeset
|
47 install -m 644 contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir}/ |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
48 |
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
49 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d |
12056
85439f43749f
mercurial.spec: specify file modes for install
Mads Kiilerich <mads@kiilerich.com>
parents:
11845
diff
changeset
|
50 install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc |
459 | 51 |
563 | 52 %clean |
53 rm -rf $RPM_BUILD_ROOT | |
459 | 54 |
563 | 55 %files |
56 %defattr(-,root,root,-) | |
10664
9602fc4e6914
mercurial.spec: remove reference to doc/ja
Greg Lindahl <greg@blekko.com>
parents:
10263
diff
changeset
|
57 %doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi |
10255
26fc868cb8b0
mercurial.spec: Alignment with AIX spec by Jim Hague
Mads Kiilerich <mads@kiilerich.com>
parents:
9635
diff
changeset
|
58 %doc %attr(644,root,root) %{_mandir}/man?/hg* |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
59 %doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc |
12056
85439f43749f
mercurial.spec: specify file modes for install
Mads Kiilerich <mads@kiilerich.com>
parents:
11845
diff
changeset
|
60 %dir %{_datadir}/zsh/ |
85439f43749f
mercurial.spec: specify file modes for install
Mads Kiilerich <mads@kiilerich.com>
parents:
11845
diff
changeset
|
61 %dir %{_datadir}/zsh/site-functions/ |
4752
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
62 %{_datadir}/zsh/site-functions/_mercurial |
12056
85439f43749f
mercurial.spec: specify file modes for install
Mads Kiilerich <mads@kiilerich.com>
parents:
11845
diff
changeset
|
63 %dir %{_datadir}/emacs/site-lisp/ |
4752
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
64 %{_datadir}/emacs/site-lisp/mercurial.el |
10255
26fc868cb8b0
mercurial.spec: Alignment with AIX spec by Jim Hague
Mads Kiilerich <mads@kiilerich.com>
parents:
9635
diff
changeset
|
65 %{_datadir}/emacs/site-lisp/mq.el |
4752
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
66 %{_bindir}/hg |
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
67 %{_bindir}/hgk |
cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Adam Spiers <hg@adamspiers.org>
parents:
4751
diff
changeset
|
68 %{_bindir}/hg-ssh |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
69 %dir %{_sysconfdir}/bash_completion.d/ |
12056
85439f43749f
mercurial.spec: specify file modes for install
Mads Kiilerich <mads@kiilerich.com>
parents:
11845
diff
changeset
|
70 %config(noreplace) %{_sysconfdir}/bash_completion.d/mercurial.sh |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
71 %dir %{_sysconfdir}/mercurial |
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
72 %dir %{_sysconfdir}/mercurial/hgrc.d |
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
73 %config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc |
8867
ff817723280a
contrib/buildrpm: Support python 2.4 and 2.6
Mads Kiilerich <mads@kiilerich.com>
parents:
7433
diff
changeset
|
74 %if "%{?pythonver}" != "2.4" |
ff817723280a
contrib/buildrpm: Support python 2.4 and 2.6
Mads Kiilerich <mads@kiilerich.com>
parents:
7433
diff
changeset
|
75 %{_libdir}/python%{pythonver}/site-packages/%{name}-*-py%{pythonver}.egg-info |
ff817723280a
contrib/buildrpm: Support python 2.4 and 2.6
Mads Kiilerich <mads@kiilerich.com>
parents:
7433
diff
changeset
|
76 %endif |
8942
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
77 %{_libdir}/python%{pythonver}/site-packages/%{name} |
51038bb526ea
Make RPM spec in contrib more aligned with the one from Fedora
Mads Kiilerich <mads@kiilerich.com>
parents:
8936
diff
changeset
|
78 %{_libdir}/python%{pythonver}/site-packages/hgext |