[poco/el6: 2/2] Merge branch 'master' into el6

[Matej Cepl]

commit 6f8bce2f9cf2e21efd4f349fc2667d9c0f5cab97
Merge: 1db997f 5dfbe64
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Jan 3 00:57:39 2012 +0100

    Merge branch 'master' into el6

 poco.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --cc poco.spec
index 147617d,8da724c..55823ac
--- a/poco.spec
+++ b/poco.spec
@@@ -1,8 -1,14 +1,13 @@@
 -
  %global poco_src_version 1.4.2p1
  %global poco_doc_version 1.4.2p1
- %global poco_rpm_release 1
+ %global poco_rpm_release 2
  
+ # build without tests on s390 (runs out of memory during linking due the 2 GB address space)
+ %ifnarch s390
  %bcond_without tests
+ %else
+ %bcond_with tests
+ %endif
  %bcond_without samples
  
  Name:             poco