- verbose make

- updated tests patch to fix one more issue

Changed files:
    git-core-tests.patch -> 1.3
    git-core.spec -> 1.221

diff --git a/git-core-tests.patch b/git-core-tests.patch
index 0bbfc3db08badc30e0501cf23f6b5f0cd6801f75..90ae78799c198cbba0e50b24d5c328734c054698 100644 (file)
--- a/git-core-tests.patch
+++ b/git-core-tests.patch
@@ -11,3 +11,17 @@ diff -ur git-1.7.0.3.orig/t/t1304-default-acl.sh git-1.7.0.3/t/t1304-default-acl
  
  # We need an arbitrary other user give permission to using ACLs. root
 
+--- git-1.7.3.2/t/t3701-add-interactive.sh.orig        2010-10-22 05:49:16.000000000 +0200
++++ git-1.7.3.2/t/t3701-add-interactive.sh     2010-11-18 22:36:35.271101613 +0100
+@@ -83,9 +83,9 @@
+ 
+ test_expect_success PERL 'setup fake editor' '
+       cat >fake_editor.sh <<EOF
+-      EOF
++EOF
+       chmod a+x fake_editor.sh &&
+-      test_set_editor "$(pwd)/fake_editor.sh" &&
++      test_set_editor "$(pwd)/fake_editor.sh"
+ '
+ 
+ test_expect_success PERL 'dummy edit works' '

diff --git a/git-core.spec b/git-core.spec
index 7e25fdf26f7e1b85161b243123c608e707714ef8..267c16b7c9e9583e7f3a1624de533a3fb3d84026 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -1,8 +1,8 @@
 #
 # Conditional build:
-%bcond_without tests   # don't perform make test
-%bcond_with            tests_cvs
-%bcond_without doc     # skip building/packaging docs/manuals (takes some time)
+%bcond_without tests           # don't perform make test
+%bcond_with    tests_cvs       # perform tests which use CVS
+%bcond_without doc             # skip building/packaging docs/manuals (takes some time)
 #
 %include       /usr/lib/rpm/macros.perl
 Summary:       The stupid content tracker
@@ -375,7 +375,8 @@ echo "BLK_SHA1=1" >> config.mak
        GITWEB_PROJECTROOT="/var/lib/git" \
        GITWEB_CSS="/gitweb/gitweb.css" \
        GITWEB_LOGO="/gitweb/git-logo.png" \
-       GITWEB_FAVICON="/gitweb/git-favicon.png"
+       GITWEB_FAVICON="/gitweb/git-favicon.png" \
+       V=1
 
 # use DOCBOOK_XSL_172=1 to fix 'the ".ft C" problem' in generated manpages.
 %{?with_doc:%{__make} -C Documentation V=1 DOCBOOK_XSL_172=1}