Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint

diff --git a/git.spec.in b/git.spec.in
index 46aee88fd15d934dd84783981f2be3ed086c9cf3..87197d10e19107883716e3ced5b4eb38c3d933be 100644 (file)
--- a/git.spec.in
+++ b/git.spec.in
@@ -86,12 +86,14 @@ Perl interface to Git
 
 %build
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
+     ETC_GITCONFIG=/etc/gitconfig \
      prefix=%{_prefix} 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 \
+     ETC_GITCONFIG=/etc/gitconfig \
      prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \
      install %{!?_without_docs: install-doc}
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'