packages: git-core/git-core.spec, git-core/git-core-tests.patch (NEW) - fix...

[draenog]

Author: draenog                      Date: Tue Mar 23 21:58:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix tests

---- Files affected:
packages/git-core:
   git-core.spec (1.195 -> 1.196) , git-core-tests.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/git-core/git-core.spec
diff -u packages/git-core/git-core.spec:1.195 packages/git-core/git-core.spec:1.196
--- packages/git-core/git-core.spec:1.195	Tue Mar 23 22:56:12 2010
+++ packages/git-core/git-core.spec	Tue Mar 23 22:58:38 2010
@@ -20,6 +20,7 @@
 Source3:	%{name}.sysconfig
 Source4:	%{name}.inet
 Source5:	%{name}.init
+Patch0:		%{name}-tests.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -350,6 +351,7 @@
 
 %prep
 %setup -q -n git-%{version}
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -656,6 +658,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.196  2010/03/23 21:58:38  draenog
+- fix tests
+
 Revision 1.195  2010/03/23 21:56:12  draenog
 - fix builds with --short-circuit
 

================================================================
Index: packages/git-core/git-core-tests.patch
diff -u /dev/null packages/git-core/git-core-tests.patch:1.1
--- /dev/null	Tue Mar 23 22:58:44 2010
+++ packages/git-core/git-core-tests.patch	Tue Mar 23 22:58:38 2010
@@ -0,0 +1,27 @@
+diff -ur git-1.7.0.3.orig/t/t1304-default-acl.sh git-1.7.0.3/t/t1304-default-acl.sh
+--- git-1.7.0.3.orig/t/t1304-default-acl.sh	2010-03-22 01:35:03.000000000 +0000
++++ git-1.7.0.3/t/t1304-default-acl.sh	2010-03-23 19:53:49.069813289 +0000
+@@ -9,6 +9,8 @@
+ # => this must come before . ./test-lib.sh
+ umask 077
+ 
++LOGNAME=$(whoami)
++
+ . ./test-lib.sh
+ 
+ # We need an arbitrary other user give permission to using ACLs. root
+Only in git-1.7.0.3/t: t1304-default-acl.sh~
+Only in git-1.7.0.3/t: .t1304-default-acl.sh.swp
+diff -ur git-1.7.0.3.orig/t/t5505-remote.sh git-1.7.0.3/t/t5505-remote.sh
+--- git-1.7.0.3.orig/t/t5505-remote.sh	2010-03-22 01:35:03.000000000 +0000
++++ git-1.7.0.3/t/t5505-remote.sh	2010-03-23 21:23:32.259135950 +0000
+@@ -688,7 +688,7 @@
+ 
+ test_expect_success 'remote set-url --delete .*' '
+ (
+-	test_must_fail git remote set-url --delete someremote .* &&
++	test_must_fail git remote set-url --delete someremote .\* &&
+ 	echo "YYY" >expect &&
+ 	echo baz >>expect &&
+ 	echo bbb >>expect &&
+Only in git-1.7.0.3/t: t5505-remote.sh~
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/git-core/git-core.spec?r1=1.195&r2=1.196&f=u