diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-20 04:47:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-20 04:47:54 +0200 |
| commit | 343d35c9166cf1713eb2787c3506fd2663466262 (patch) | |
| tree | bed6058fd6ea00ac10528621ea5ac3788e1f4da1 /git-core.spec.in | |
| parent | show-branch: Be nicer when running in a corrupt repository. (diff) | |
| download | git-343d35c9166cf1713eb2787c3506fd2663466262.tar.xz git-343d35c9166cf1713eb2787c3506fd2663466262.zip | |
Ship our own copy of subprocess.py
so people without the latest Python could run merge-recursive.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-core.spec.in')
| -rw-r--r-- | git-core.spec.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-core.spec.in b/git-core.spec.in index 6c17d523f9..61beebd61c 100644 --- a/git-core.spec.in +++ b/git-core.spec.in @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -23,11 +23,13 @@ elsewhere for tools for ordinary humans layered on top of this. %setup -q %build -make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \ +make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ + prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} %clean |