Merge branch 'maint'

* maint:
git-svn: don't attempt to minimize URLs by default
git-svn: fix segfaults due to initial SVN pool being cleared
git-svn: clean up caching of SVN::Ra functions
git-svn: don't drop the username from URLs when dcommit is run
RPM spec: include files in technical/ to package.
Remove stale non-static-inline prototype for tree_entry_extract()
git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.

diff --combined git.spec.in
index 16148d401942a668727fa4092a95ba04c041659a,2170424599e2013ac806d0c021fa4709ee6d7244..3a45eb876157d9979f51fe88ecc5d5ae4a93ff1c
--- 1/git.spec.in
--- 2/git.spec.in
+++ b/git.spec.in
@@@ -1,7 -1,4 +1,7 @@@
  # Pass --without docs to rpmbuild if you don't want the documentation
 +
 +%define python_path /usr/bin/python
 +
  Name:                 git
  Version:      @@VERSION@@
  Release:      1%{?dist}
@@@ -12,7 -9,7 +12,7 @@@ URL:           http://kernel.org/pub/software/s
  Source:       http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
  BuildRequires:        zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
  BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 -Requires:     git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git
 +Requires:     git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, git-p4, perl-Git
  
  %description
  Git is a fast, scalable, distributed revision control system with an
@@@ -53,13 -50,6 +53,13 @@@ Requires:       git-core = %{version}-%
  %description arch
  Git tools for importing Arch repositories.
  
 +%package p4
 +Summary:        Git tools for importing Perforce repositories
 +Group:          Development/Tools
 +Requires:       git-core = %{version}-%{release}, python
 +%description p4
 +Git tools for importing Perforce repositories.
 +
  %package email
  Summary:        Git tools for sending email
  Group:          Development/Tools
@@@ -95,25 -85,25 +95,25 @@@ 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 {} ';'
  
 -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
 +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "p4import|archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
  (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
  %if %{!?_without_docs:1}0
 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
 +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "p4import|archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
  %else
  rm -rf $RPM_BUILD_ROOT%{_mandir}
  %endif
@@@ -145,13 -135,6 +145,13 @@@ rm -rf $RPM_BUILD_ROO
  %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
  %{!?_without_docs: %doc Documentation/git-archimport.html }
  
 +%files p4
 +%defattr(-,root,root)
 +%doc Documentation/git-p4import.txt
 +%{_bindir}/git-p4import
 +%{!?_without_docs: %{_mandir}/man1/git-p4import.1*}
 +%{!?_without_docs: %doc Documentation/git-p4import.html }
 +
  %files email
  %defattr(-,root,root)
  %doc Documentation/*email*.txt
@@@ -163,7 -146,6 +163,7 @@@
  %defattr(-,root,root)
  %{_bindir}/git-gui
  %{_bindir}/git-citool
 +%{_datadir}/git-gui/
  # Not Yet...
  # %{!?_without_docs: %{_mandir}/man1/git-gui.1}
  # %{!?_without_docs: %doc Documentation/git-gui.html}
@@@ -185,14 -167,16 +185,19 @@@
  %{_datadir}/git-core/
  %doc README COPYING Documentation/*.txt
  %{!?_without_docs: %doc Documentation/*.html Documentation/howto}
+ %{!?_without_docs: %doc Documentation/technical}
  
  %changelog
+ * Tue May 13 2007 Quy Tonthat <qtonthat@gmail.com>
+ - Added lib files for git-gui
+ - Added Documentation/technical (As needed by Git Users Manual)
+ 
  * Tue May 8 2007 Quy Tonthat <qtonthat@gmail.com>
  - Added howto files
  
 +* Tue Mar 27 2007 Eygene Ryabinkin <rea-git@codelabs.ru>
 +- Added the git-p4 package: Perforce import stuff.
 +
  * Mon Feb 13 2007 Nicolas Pitre <nico@cam.org>
  - Update core package description (Git isn't as stupid as it used to be)