From: Junio C Hamano <junkio@cox.net>
Date: Tue, 24 Apr 2007 07:08:16 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc1~35
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=520d7e278cfd25057e883575060b7378dfab61dc;p=git.git

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
---

520d7e278cfd25057e883575060b7378dfab61dc
diff --cc git.spec.in
index f0746ed78,87197d10e..556bdda7a
--- a/git.spec.in
+++ b/git.spec.in
@@@ -95,15 -85,17 +95,17 @@@ Perl interface to Gi
  %setup -q
  
  %build
 -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
 +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_P4IMPORT=YesPlease \
+      ETC_GITCONFIG=/etc/gitconfig \
 -     prefix=%{_prefix} all %{!?_without_docs: doc}
 +     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_OWN_SUBPROCESS_PY=YesPlease \
 +     WITH_P4IMPORT=YesPlease prefix=%{_prefix} mandir=%{_mandir} \
+      ETC_GITCONFIG=/etc/gitconfig \
 -     prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \
 -     install %{!?_without_docs: install-doc}
 +     PYTHON_PATH=%{python_path} \
 +     INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
  find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
  find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
  find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'