diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-24 09:08:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 09:08:16 +0200 |
| commit | 520d7e278cfd25057e883575060b7378dfab61dc (patch) | |
| tree | 3f20d1056ba4a3e1de652e25d32f2736395a8e2b /git.spec.in | |
| parent | git-fetch: Fix "argument list too long" (diff) | |
| parent | Documentation/git-reset.txt: suggest git commit --amend in example. (diff) | |
| download | git-520d7e278cfd25057e883575060b7378dfab61dc.tar.xz git-520d7e278cfd25057e883575060b7378dfab61dc.zip | |
Merge branch 'maint'
* maint:
Documentation/git-reset.txt: suggest git commit --amend in example.
Build RPM with ETC_GITCONFIG=/etc/gitconfig
Ignore all man sections as they are generated files.
Fix typo in git-am: s/Was is/Was it/
Reverse the order of -b and --track in the man page.
dir.c(common_prefix): Fix two bugs
Conflicts:
git.spec.in
Diffstat (limited to 'git.spec.in')
| -rw-r--r-- | git.spec.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git.spec.in b/git.spec.in index f0746ed78c..556bdda7aa 100644 --- a/git.spec.in +++ b/git.spec.in @@ -96,12 +96,14 @@ Perl interface to Git %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_P4IMPORT=YesPlease \ + ETC_GITCONFIG=/etc/gitconfig \ prefix=%{_prefix} PYTHON_PATH=%{python_path} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ WITH_P4IMPORT=YesPlease prefix=%{_prefix} mandir=%{_mandir} \ + ETC_GITCONFIG=/etc/gitconfig \ PYTHON_PATH=%{python_path} \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' |