Mercurial > hg-stable
changeset 21638:5337cb17fa1f
buildrpm: various minor cleanup
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 20 May 2014 03:57:21 +0200 |
| parents | 48ef68004ec9 |
| children | 57e0f053e529 |
| files | contrib/buildrpm contrib/mercurial.spec |
| diffstat | 2 files changed, 9 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/buildrpm Sat May 10 14:54:39 2014 -0700 +++ b/contrib/buildrpm Tue May 20 03:57:21 2014 +0200 @@ -1,11 +1,11 @@ -#!/bin/sh +#!/bin/sh -e # -# Build a Mercurial RPM in place. +# Build a Mercurial RPM from the current repo # # Tested on -# - Fedora 8 (with docutils 0.5) -# - Fedora 11 -# - OpenSuse 11.2 +# - Fedora 20 +# - CentOS 5 +# - centOS 6 cd "`dirname $0`/.." HG="$PWD/hg"
--- a/contrib/mercurial.spec Sat May 10 14:54:39 2014 -0700 +++ b/contrib/mercurial.spec Tue May 20 03:57:21 2014 +0200 @@ -8,15 +8,6 @@ Source0: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -# From the README: -# -# Note: some distributions fails to include bits of distutils by -# default, you'll need python-dev to install. You'll also need a C -# compiler and a 3-way merge tool like merge, tkdiff, or kdiff3. -# -# python-devel provides an adequate python-dev. The merge tool is a -# run-time dependency. -# BuildRequires: python >= 2.4, python-devel, make, gcc, python-docutils >= 0.5, gettext Provides: hg = %{version}-%{release} Requires: python >= 2.4 @@ -40,8 +31,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir} -install -m 755 contrib/hgk $RPM_BUILD_ROOT%{_bindir} -install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir} +install -m 755 contrib/hgk $RPM_BUILD_ROOT%{_bindir}/ +install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}/ bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d mkdir -p $bash_completion_dir @@ -52,8 +43,8 @@ install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir} -install -m 644 contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir} -install -m 644 contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir} +install -m 644 contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir}/ +install -m 644 contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir}/ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc