From cd8755b8b822734fec62b61a0d0ac7e6b42313e3 Mon Sep 17 00:00:00 2001
From: Alexey Torkhov <atorkhov@fedoraproject.org>
Date: Mar 01 2009 12:03:34 +0000
Subject: - Adding mercator dep to -devel subpackage

- Reenabling the tests

---

diff --git a/eris-1.3.14-gcc44.patch b/eris-1.3.14-gcc44.patch
index f5f8ac4..62935cd 100644
--- a/eris-1.3.14-gcc44.patch
+++ b/eris-1.3.14-gcc44.patch
@@ -7,3 +7,41 @@ diff -ur eris-1.3.14/Eris/BaseConnection.cpp eris-1.3.14.new/Eris/BaseConnection
  #include <skstream/skstream.h>
  
  #ifdef HAVE_CONFIG_H
+diff --git a/test/stubServer.cpp b/test/stubServer.cpp
+index 233b8ba..32e9ba6 100644
+--- a/test/stubServer.cpp
++++ b/test/stubServer.cpp
+@@ -17,6 +17,7 @@
+ #include <Atlas/Objects/objectFactory.h>
+ 
+ #include <cstdlib>
++#include <cstdio>
+ #include <sys/wait.h>
+ 
+ using Atlas::Objects::Root;
+diff --git a/test/clientConnection.cpp b/test/clientConnection.cpp
+index c08a1b1..7801ee7 100644
+--- a/test/clientConnection.cpp
++++ b/test/clientConnection.cpp
+@@ -17,6 +17,8 @@
+ #include <Atlas/Objects/Operation.h>
+ #include <Atlas/Codecs/Bach.h>
+ 
++#include <cstdio>
++
+ using Atlas::Objects::Root;
+ using Atlas::Objects::smart_dynamic_cast;
+ using namespace Atlas::Objects::Operation;
+diff --git a/test/commander.cpp b/test/commander.cpp
+index c19f505..3fedb6f 100644
+--- a/test/commander.cpp
++++ b/test/commander.cpp
+@@ -14,6 +14,8 @@
+ #include <Eris/LogStream.h>
+ #include <Atlas/Objects/Encoder.h>
+ 
++#include <cstdio>
++
+ using Atlas::Objects::Root;
+ using Atlas::Objects::smart_dynamic_cast;
+ using namespace Atlas::Objects::Operation;
diff --git a/eris.spec b/eris.spec
index d5de455..b0ce55c 100644
--- a/eris.spec
+++ b/eris.spec
@@ -1,6 +1,6 @@
 Name:           eris
 Version:        1.3.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Client-side session layer for Atlas-C++
 
 Group:          Development/Libraries
@@ -56,9 +56,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}-1.3.la
 
 %check
-# Don't run the tests.  They seem to hang sometimes.  This will
-# be reenabled once upstream has a fix.
-#make %{?_smp_mflags} check
+# They seem to hang sometimes.
+make %{?_smp_mflags} check
 
 
 %clean
@@ -84,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 01 2009 Alexey Torkhov <atorkhov@gmail.com> - 1.3.14-2
+- Adding mercator dep to -devel subpackage
+- Reenabling the tests
+
 * Fri Feb 27 2009 Alexey Torkhov <atorkhov@gmail.com> - 1.3.14-1
 - Update to 1.3.14