poldek: poldek/tests/sh/07-depsolver, poldek/tests/build-test-rpm.sh - up t...

[mis]

Author: mis                          Date: Mon May 12 15:48:58 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- up to th's rpm

---- Files affected:
poldek/poldek/tests/sh:
   07-depsolver (1.6 -> 1.7) 
poldek/poldek/tests:
   build-test-rpm.sh (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: poldek/poldek/tests/sh/07-depsolver
diff -u poldek/poldek/tests/sh/07-depsolver:1.6 poldek/poldek/tests/sh/07-depsolver:1.7
--- poldek/poldek/tests/sh/07-depsolver:1.6	Mon May 12 00:26:29 2008
+++ poldek/poldek/tests/sh/07-depsolver	Mon May 12 17:48:53 2008
@@ -56,8 +56,13 @@
   
   params=""
   [ $# -gt 0 ] && params="$@";  
-  #eval ./build-test-rpm.sh -d $destdir -n $name -v $version $params
-  eval ./build-test-rpm.sh -d $destdir -n $name -v $version $params >/dev/null 2>&1 || fail "build package $name failed"
+  if [ -z "$VERBOSE" ]; then
+      eval ./build-test-rpm.sh -d $destdir -n $name -v $version $params >/dev/null 2>&1 || fail "build package $name failed"
+  else    
+      eval ./build-test-rpm.sh -d $destdir -n $name -v $version $params
+      [ $? -eq 0 ] || fail "build package $name failed"
+  fi
+
 } 
 
 build() {

================================================================
Index: poldek/poldek/tests/build-test-rpm.sh
diff -u poldek/poldek/tests/build-test-rpm.sh:1.10 poldek/poldek/tests/build-test-rpm.sh:1.11
--- poldek/poldek/tests/build-test-rpm.sh:1.10	Sun Jan 27 16:58:59 2008
+++ poldek/poldek/tests/build-test-rpm.sh	Mon May 12 17:48:53 2008
@@ -129,4 +129,4 @@
 
 echo -e "%clean\nrm -rf \$RPM_BUILD_ROOT" >> $SPEC
 [ ! -d "$rpmdir" ] && rpmdir="$TMPDIR" 
-rpmbuild --define "_rpmdir $rpmdir"  -bb $SPEC
+rpmbuild --define 'debug_package nil' --define '__spec_install_post_chrpath echo' --define "_rpmdir $rpmdir"  -bb $SPEC
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/tests/sh/07-depsolver?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/tests/build-test-rpm.sh?r1=1.10&r2=1.11&f=u