From c3a83f62eccef46775ec93e4d2a4823cca0aa7b471e51c76f3b8632e112adf0c Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 16 Oct 2012 19:32:02 +0000
Subject: [PATCH] Accepting request 138328 from devel:tools:scm

- Use ./.make also in %check to test exactly what was built
- Avoid duplicate file warnings (forwarded request 138128 from AndreasSchwab)

OBS-URL: https://build.opensuse.org/request/show/138328
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=94
---
 git.changes | 6 ++++++
 git.spec    | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/git.changes b/git.changes
index 7d52151..c5b215f 100644
--- a/git.changes
+++ b/git.changes
@@ -32,6 +32,12 @@ Thu Oct 11 00:19:07 CST 2012 - douglarek@outlook.com
 
     Also contains a handful of documentation updates.
 
+-------------------------------------------------------------------
+Mon Oct  8 20:50:47 UTC 2012 - schwab@linux-m68k.org
+
+- Use ./.make also in %check to test exactly what was built
+- Avoid duplicate file warnings
+
 -------------------------------------------------------------------
 Thu Oct  4 22:29:10 CST 2012 - douglarek@outlook.com
 
diff --git a/git.spec b/git.spec
index 42ed60d..ecb8e05 100644
--- a/git.spec
+++ b/git.spec
@@ -236,7 +236,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
 install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon
 ###
 (find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)                   > bin-man-doc-files
-(find $RPM_BUILD_ROOT%{gitexecdir} -mindepth 1 | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)               >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@)               >> bin-man-doc-files
 (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
 ( pushd perl
   perl Makefile.PL
@@ -268,7 +268,7 @@ cat %{name}.lang >>bin-man-doc-files
 %fdupes -s $RPM_BUILD_ROOT
 
 %check
-make %{?_smp_mflags} test
+./.make %{?_smp_mflags} test
 
 %pre daemon
 if ! /usr/bin/getent passwd git-daemon >/dev/null; then
@@ -365,9 +365,9 @@ fi
 
 %files core -f bin-man-doc-files
 %defattr(-,root,root)
-%{_bindir}/git
 %{_datadir}/git-core/
 %dir %{gitexecdir}
+%dir %{gitexecdir}/mergetools
 %doc README COPYING Documentation/*.txt
 %{!?_without_docs: %doc Documentation/*.html }
 %if 0%{?suse_version} < 1140
@@ -375,7 +375,6 @@ fi
 %endif
 %{perl_vendorlib}/Git.pm
 %{perl_vendorlib}/Git/
-%{perl_vendorlib}/Git/*.pm
 %{perl_vendorarch}/auto/Git/
 /etc/bash_completion.d/*.sh