From 6b1e62ae6d45795c6bcf4b41a513c8fe6d9873ba Mon Sep 17 00:00:00 2001 From: Kacper Kornet Date: Tue, 23 Mar 2010 21:58:38 +0000 Subject: [PATCH] - fix tests Changed files: git-core-tests.patch -> 1.1 git-core.spec -> 1.196 --- git-core-tests.patch | 27 +++++++++++++++++++++++++++ git-core.spec | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 git-core-tests.patch diff --git a/git-core-tests.patch b/git-core-tests.patch new file mode 100644 index 0000000..beceade --- /dev/null +++ b/git-core-tests.patch @@ -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~ diff --git a/git-core.spec b/git-core.spec index 22e4e25..cd76a47 100644 --- a/git-core.spec +++ b/git-core.spec @@ -19,6 +19,7 @@ Source2: %{name}-gitweb-httpd.conf Source3: %{name}.sysconfig Source4: %{name}.inet Source5: %{name}.init +Patch0: %{name}-tests.patch URL: http://git-scm.com/ BuildRequires: autoconf BuildRequires: automake @@ -349,6 +350,7 @@ Ta wtyczka dostarcza podświetlanie składni dla treści commitów gita. %prep %setup -q -n git-%{version} +%patch0 -p1 %build %{__aclocal} -- 2.44.0