ソースを参照

upgrading package: cego 2.9.6 -> 2.10.1

Ralf S. Engelschall 14 年 前
コミット
c82a647001
2 ファイル変更155 行追加171 行削除
  1. 152 168
      cego/cego.patch
  2. 3 3
      cego/cego.spec

+ 152 - 168
cego/cego.patch

@@ -1,6 +1,6 @@
-Index: cego-2.9.6/Makefile.in
---- cego-2.9.6/Makefile.in.orig	2010-08-21 15:57:58.000000000 +0200
-+++ cego-2.9.6/Makefile.in	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/Makefile.in
+--- cego-2.10.1/Makefile.in.orig	2010-08-21 15:57:58.000000000 +0200
++++ cego-2.10.1/Makefile.in	2011-06-25 10:31:27.000000000 +0200
 @@ -35,8 +35,6 @@
  
  all:
@@ -10,9 +10,9 @@ Index: cego-2.9.6/Makefile.in
  
  install:
  	( cd src; make install )
-Index: cego-2.9.6/src/CegoAdminThreadPool.cc
---- cego-2.9.6/src/CegoAdminThreadPool.cc.orig	2010-09-07 23:18:42.000000000 +0200
-+++ cego-2.9.6/src/CegoAdminThreadPool.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoAdminThreadPool.cc
+--- cego-2.10.1/src/CegoAdminThreadPool.cc.orig	2011-06-13 15:10:27.000000000 +0200
++++ cego-2.10.1/src/CegoAdminThreadPool.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -21,20 +21,20 @@ Index: cego-2.9.6/src/CegoAdminThreadPool.cc
  #include "CegoAdminThreadPool.h"
  
  #include <lfc/Sleeper.h>
-Index: cego-2.9.6/src/CegoAggregation.cc
---- cego-2.9.6/src/CegoAggregation.cc.orig	2010-07-02 14:28:35.000000000 +0200
-+++ cego-2.9.6/src/CegoAggregation.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoAggregation.cc
+--- cego-2.10.1/src/CegoAggregation.cc.orig	2011-06-23 17:29:07.000000000 +0200
++++ cego-2.10.1/src/CegoAggregation.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -34,6 +34,7 @@
  ///////////////////////////////////////////////////////////////////////////////
  
  // INCLUDES
 +#include <string.h>
  #include "CegoAggregation.h"
- #include "CegoFactor.h"
+ #include "CegoExpr.h"
  #include "CegoXMLdef.h"
-Index: cego-2.9.6/src/CegoAttrDesc.cc
---- cego-2.9.6/src/CegoAttrDesc.cc.orig	2010-07-02 14:30:52.000000000 +0200
-+++ cego-2.9.6/src/CegoAttrDesc.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoAttrDesc.cc
+--- cego-2.10.1/src/CegoAttrDesc.cc.orig	2011-06-23 17:04:30.000000000 +0200
++++ cego-2.10.1/src/CegoAttrDesc.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -43,9 +43,9 @@ Index: cego-2.9.6/src/CegoAttrDesc.cc
  #include "CegoAttrDesc.h"
  #include "CegoXMLdef.h"
  
-Index: cego-2.9.6/src/CegoBlob.cc
---- cego-2.9.6/src/CegoBlob.cc.orig	2010-09-07 23:20:28.000000000 +0200
-+++ cego-2.9.6/src/CegoBlob.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoBlob.cc
+--- cego-2.10.1/src/CegoBlob.cc.orig	2010-11-21 01:17:05.000000000 +0100
++++ cego-2.10.1/src/CegoBlob.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,8 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -55,9 +55,9 @@ Index: cego-2.9.6/src/CegoBlob.cc
  #include "CegoBlob.h"
  
  #include <lfc/Exception.h>
-Index: cego-2.9.6/src/CegoBufferPage.cc
---- cego-2.9.6/src/CegoBufferPage.cc.orig	2010-09-07 23:20:45.000000000 +0200
-+++ cego-2.9.6/src/CegoBufferPage.cc	2010-09-09 12:00:11.000000000 +0200
+Index: cego-2.10.1/src/CegoBufferPage.cc
+--- cego-2.10.1/src/CegoBufferPage.cc.orig	2011-06-20 21:08:36.000000000 +0200
++++ cego-2.10.1/src/CegoBufferPage.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -66,9 +66,9 @@ Index: cego-2.9.6/src/CegoBufferPage.cc
  #include <lfc/Exception.h>
  
  #include "CegoDefs.h"
-Index: cego-2.9.6/src/CegoBufferPool.cc
---- cego-2.9.6/src/CegoBufferPool.cc.orig	2010-09-07 23:21:15.000000000 +0200
-+++ cego-2.9.6/src/CegoBufferPool.cc	2010-09-09 12:00:25.000000000 +0200
+Index: cego-2.10.1/src/CegoBufferPool.cc
+--- cego-2.10.1/src/CegoBufferPool.cc.orig	2011-06-21 00:10:08.000000000 +0200
++++ cego-2.10.1/src/CegoBufferPool.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,8 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -78,9 +78,9 @@ Index: cego-2.9.6/src/CegoBufferPool.cc
  #include <lfc/Exception.h>
  #include <lfc/CommandExecuter.h>
  #include <lfc/Datetime.h>
-Index: cego-2.9.6/src/CegoCheckObject.cc
---- cego-2.9.6/src/CegoCheckObject.cc.orig	2010-07-02 14:36:19.000000000 +0200
-+++ cego-2.9.6/src/CegoCheckObject.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoCheckObject.cc
+--- cego-2.10.1/src/CegoCheckObject.cc.orig	2010-11-21 01:38:47.000000000 +0100
++++ cego-2.10.1/src/CegoCheckObject.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -89,9 +89,9 @@ Index: cego-2.9.6/src/CegoCheckObject.cc
  #include "CegoCheckObject.h"
  #include "CegoXMLdef.h"
  #include "CegoXMLHelper.h"
-Index: cego-2.9.6/src/CegoClient.cc
---- cego-2.9.6/src/CegoClient.cc.orig	2010-09-07 23:48:43.000000000 +0200
-+++ cego-2.9.6/src/CegoClient.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoClient.cc
+--- cego-2.10.1/src/CegoClient.cc.orig	2011-06-21 08:13:20.000000000 +0200
++++ cego-2.10.1/src/CegoClient.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -100,9 +100,9 @@ Index: cego-2.9.6/src/CegoClient.cc
  #include <locale.h>
  #include <stdlib.h>
  #include <stdio.h>
-Index: cego-2.9.6/src/CegoCondDesc.cc
---- cego-2.9.6/src/CegoCondDesc.cc.orig	2010-07-02 14:37:41.000000000 +0200
-+++ cego-2.9.6/src/CegoCondDesc.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoCondDesc.cc
+--- cego-2.10.1/src/CegoCondDesc.cc.orig	2011-06-23 17:42:52.000000000 +0200
++++ cego-2.10.1/src/CegoCondDesc.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -111,9 +111,9 @@ Index: cego-2.9.6/src/CegoCondDesc.cc
  #include "CegoCondDesc.h"
  #include "CegoXMLdef.h"
  
-Index: cego-2.9.6/src/CegoContentObject.cc
---- cego-2.9.6/src/CegoContentObject.cc.orig	2010-07-02 14:42:29.000000000 +0200
-+++ cego-2.9.6/src/CegoContentObject.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoContentObject.cc
+--- cego-2.10.1/src/CegoContentObject.cc.orig	2010-12-22 12:31:50.000000000 +0100
++++ cego-2.10.1/src/CegoContentObject.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -34,6 +34,8 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -123,9 +123,9 @@ Index: cego-2.9.6/src/CegoContentObject.cc
  #include "CegoContentObject.h"
  #include "CegoTypeConverter.h"
  
-Index: cego-2.9.6/src/CegoDataPointer.cc
---- cego-2.9.6/src/CegoDataPointer.cc.orig	2010-07-02 14:43:06.000000000 +0200
-+++ cego-2.9.6/src/CegoDataPointer.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoDataPointer.cc
+--- cego-2.10.1/src/CegoDataPointer.cc.orig	2010-11-21 01:19:33.000000000 +0100
++++ cego-2.10.1/src/CegoDataPointer.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -133,10 +133,10 @@ Index: cego-2.9.6/src/CegoDataPointer.cc
 +#include <string.h>
  #include "CegoDataPointer.h"
  
- CegoDataPointer::CegoDataPointer()
-Index: cego-2.9.6/src/CegoDbHandler.cc
---- cego-2.9.6/src/CegoDbHandler.cc.orig	2010-09-07 23:24:45.000000000 +0200
-+++ cego-2.9.6/src/CegoDbHandler.cc	2010-09-09 12:00:45.000000000 +0200
+ #include <string.h>
+Index: cego-2.10.1/src/CegoDbHandler.cc
+--- cego-2.10.1/src/CegoDbHandler.cc.orig	2011-06-20 23:52:52.000000000 +0200
++++ cego-2.10.1/src/CegoDbHandler.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,8 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -146,9 +146,9 @@ Index: cego-2.9.6/src/CegoDbHandler.cc
  #include <lfc/AESCrypt.h>
  #include <lfc/Datetime.h>
  
-Index: cego-2.9.6/src/CegoDbThread.cc
---- cego-2.9.6/src/CegoDbThread.cc.orig	2010-09-07 23:24:11.000000000 +0200
-+++ cego-2.9.6/src/CegoDbThread.cc	2010-09-09 12:00:59.000000000 +0200
+Index: cego-2.10.1/src/CegoDbThread.cc
+--- cego-2.10.1/src/CegoDbThread.cc.orig	2011-06-23 16:34:15.000000000 +0200
++++ cego-2.10.1/src/CegoDbThread.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -39,6 +39,7 @@
  ///////////////////////////////////////////////////////////////////////////////
  
@@ -156,10 +156,10 @@ Index: cego-2.9.6/src/CegoDbThread.cc
 +#include <string.h>
  #include <lfc/Exception.h>
  #include <lfc/Sleeper.h>
- 
-Index: cego-2.9.6/src/CegoDbThreadPool.cc
---- cego-2.9.6/src/CegoDbThreadPool.cc.orig	2010-09-07 23:23:50.000000000 +0200
-+++ cego-2.9.6/src/CegoDbThreadPool.cc	2010-09-09 12:01:13.000000000 +0200
+ #include <lfc/ThreadLock.h>
+Index: cego-2.10.1/src/CegoDbThreadPool.cc
+--- cego-2.10.1/src/CegoDbThreadPool.cc.orig	2011-06-16 18:12:06.000000000 +0200
++++ cego-2.10.1/src/CegoDbThreadPool.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -168,9 +168,9 @@ Index: cego-2.9.6/src/CegoDbThreadPool.cc
  #include <lfc/Exception.h>
  #include <lfc/Host.h>
  #include <lfc/NetHandler.h>
-Index: cego-2.9.6/src/CegoDefs.h
---- cego-2.9.6/src/CegoDefs.h.orig	2010-09-07 23:10:18.000000000 +0200
-+++ cego-2.9.6/src/CegoDefs.h	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoDefs.h
+--- cego-2.10.1/src/CegoDefs.h.orig	2011-06-22 18:38:17.000000000 +0200
++++ cego-2.10.1/src/CegoDefs.h	2011-06-25 10:31:27.000000000 +0200
 @@ -35,6 +35,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -181,10 +181,10 @@ Index: cego-2.9.6/src/CegoDefs.h
  #ifdef HAVE_MINGW32
  #include <windows.h>
  #endif
-Index: cego-2.9.6/src/CegoDistManager.cc
---- cego-2.9.6/src/CegoDistManager.cc.orig	2010-09-07 23:25:38.000000000 +0200
-+++ cego-2.9.6/src/CegoDistManager.cc	2010-09-09 09:48:17.000000000 +0200
-@@ -33,6 +33,9 @@
+Index: cego-2.10.1/src/CegoDistManager.cc
+--- cego-2.10.1/src/CegoDistManager.cc.orig	2011-06-23 14:01:36.000000000 +0200
++++ cego-2.10.1/src/CegoDistManager.cc	2011-06-25 10:31:27.000000000 +0200
+@@ -34,6 +34,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
  
@@ -194,9 +194,9 @@ Index: cego-2.9.6/src/CegoDistManager.cc
  #include "CegoDistManager.h"
  
  #include <lfc/Exception.h>
-Index: cego-2.9.6/src/CegoExpOutStream.cc
---- cego-2.9.6/src/CegoExpOutStream.cc.orig	2010-09-07 23:27:23.000000000 +0200
-+++ cego-2.9.6/src/CegoExpOutStream.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoExpOutStream.cc
+--- cego-2.10.1/src/CegoExpOutStream.cc.orig	2010-11-21 01:20:51.000000000 +0100
++++ cego-2.10.1/src/CegoExpOutStream.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -207,9 +207,9 @@ Index: cego-2.9.6/src/CegoExpOutStream.cc
  // base includes
  #include <lfc/Base64Coder.h>
  
-Index: cego-2.9.6/src/CegoExpr.cc
---- cego-2.9.6/src/CegoExpr.cc.orig	2010-07-02 15:09:45.000000000 +0200
-+++ cego-2.9.6/src/CegoExpr.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoExpr.cc
+--- cego-2.10.1/src/CegoExpr.cc.orig	2011-06-23 17:29:09.000000000 +0200
++++ cego-2.10.1/src/CegoExpr.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -220,9 +220,9 @@ Index: cego-2.9.6/src/CegoExpr.cc
  #include "CegoExpr.h"
  
  #include "CegoXMLdef.h"
-Index: cego-2.9.6/src/CegoFactor.cc
---- cego-2.9.6/src/CegoFactor.cc.orig	2010-09-07 23:27:43.000000000 +0200
-+++ cego-2.9.6/src/CegoFactor.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoFactor.cc
+--- cego-2.10.1/src/CegoFactor.cc.orig	2011-06-23 18:21:03.000000000 +0200
++++ cego-2.10.1/src/CegoFactor.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  // 
  ///////////////////////////////////////////////////////////////////////////////
@@ -233,22 +233,22 @@ Index: cego-2.9.6/src/CegoFactor.cc
  // INCLUDES
  #include <lfc/Exception.h>
  
-Index: cego-2.9.6/src/CegoFieldValue.cc
---- cego-2.9.6/src/CegoFieldValue.cc.orig	2010-09-07 23:28:20.000000000 +0200
-+++ cego-2.9.6/src/CegoFieldValue.cc	2010-09-09 09:48:17.000000000 +0200
-@@ -33,6 +33,9 @@
- //
- ///////////////////////////////////////////////////////////////////////////////
+Index: cego-2.10.1/src/CegoFieldValue.cc
+--- cego-2.10.1/src/CegoFieldValue.cc.orig	2011-06-21 00:26:37.000000000 +0200
++++ cego-2.10.1/src/CegoFieldValue.cc	2011-06-25 10:31:27.000000000 +0200
+@@ -41,6 +41,9 @@
+ #include <lfc/BigDecimal.h>
+ #include <lfc/Tokenizer.h>
  
 +#include <stdlib.h>
 +#include <string.h>
 +
  #include "CegoFieldValue.h"
- 
- #include <lfc/Exception.h>
-Index: cego-2.9.6/src/CegoFunction.cc
---- cego-2.9.6/src/CegoFunction.cc.orig	2010-09-07 23:29:03.000000000 +0200
-+++ cego-2.9.6/src/CegoFunction.cc	2010-09-09 12:01:29.000000000 +0200
+ #include "CegoTypeConverter.h"
+ #include "CegoDefs.h"
+Index: cego-2.10.1/src/CegoFunction.cc
+--- cego-2.10.1/src/CegoFunction.cc.orig	2011-06-23 17:29:07.000000000 +0200
++++ cego-2.10.1/src/CegoFunction.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,8 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -258,9 +258,9 @@ Index: cego-2.9.6/src/CegoFunction.cc
  #include <lfc/Datetime.h>
  #include <lfc/Tokenizer.h>
  
-Index: cego-2.9.6/src/CegoGroupEntry.cc
---- cego-2.9.6/src/CegoGroupEntry.cc.orig	2010-09-07 23:29:22.000000000 +0200
-+++ cego-2.9.6/src/CegoGroupEntry.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoGroupEntry.cc
+--- cego-2.10.1/src/CegoGroupEntry.cc.orig	2010-11-21 01:41:27.000000000 +0100
++++ cego-2.10.1/src/CegoGroupEntry.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -271,9 +271,9 @@ Index: cego-2.9.6/src/CegoGroupEntry.cc
  // base includes
  #include <lfc/Exception.h>
  
-Index: cego-2.9.6/src/CegoGroupSpace.cc
---- cego-2.9.6/src/CegoGroupSpace.cc.orig	2010-09-07 23:29:39.000000000 +0200
-+++ cego-2.9.6/src/CegoGroupSpace.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoGroupSpace.cc
+--- cego-2.10.1/src/CegoGroupSpace.cc.orig	2011-06-16 21:52:19.000000000 +0200
++++ cego-2.10.1/src/CegoGroupSpace.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -284,9 +284,9 @@ Index: cego-2.9.6/src/CegoGroupSpace.cc
  // base includes
  #include <lfc/Exception.h>
  
-Index: cego-2.9.6/src/CegoImpInStream.cc
---- cego-2.9.6/src/CegoImpInStream.cc.orig	2010-09-07 23:29:55.000000000 +0200
-+++ cego-2.9.6/src/CegoImpInStream.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoImpInStream.cc
+--- cego-2.10.1/src/CegoImpInStream.cc.orig	2011-03-23 21:40:57.000000000 +0100
++++ cego-2.10.1/src/CegoImpInStream.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -297,9 +297,9 @@ Index: cego-2.9.6/src/CegoImpInStream.cc
  // base includes
  #include <lfc/Base64Coder.h>
  
-Index: cego-2.9.6/src/CegoIndexCursor.cc
---- cego-2.9.6/src/CegoIndexCursor.cc.orig	2010-07-02 15:33:44.000000000 +0200
-+++ cego-2.9.6/src/CegoIndexCursor.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoIndexCursor.cc
+--- cego-2.10.1/src/CegoIndexCursor.cc.orig	2011-06-22 21:31:35.000000000 +0200
++++ cego-2.10.1/src/CegoIndexCursor.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -34,6 +34,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -310,9 +310,9 @@ Index: cego-2.9.6/src/CegoIndexCursor.cc
  // cego includes
  #include "CegoIndexCursor.h"
  #include "CegoTupleState.h"
-Index: cego-2.9.6/src/CegoIndexEntry.cc
---- cego-2.9.6/src/CegoIndexEntry.cc.orig	2010-09-07 23:30:39.000000000 +0200
-+++ cego-2.9.6/src/CegoIndexEntry.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoIndexEntry.cc
+--- cego-2.10.1/src/CegoIndexEntry.cc.orig	2010-11-21 01:48:24.000000000 +0100
++++ cego-2.10.1/src/CegoIndexEntry.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -323,9 +323,9 @@ Index: cego-2.9.6/src/CegoIndexEntry.cc
  // base includes
  #include <lfc/Exception.h>
  
-Index: cego-2.9.6/src/CegoIndexManager.cc
---- cego-2.9.6/src/CegoIndexManager.cc.orig	2010-09-07 23:30:56.000000000 +0200
-+++ cego-2.9.6/src/CegoIndexManager.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoIndexManager.cc
+--- cego-2.10.1/src/CegoIndexManager.cc.orig	2011-06-02 13:08:24.000000000 +0200
++++ cego-2.10.1/src/CegoIndexManager.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -336,9 +336,9 @@ Index: cego-2.9.6/src/CegoIndexManager.cc
  // base includes
  #include <lfc/Exception.h>
  
-Index: cego-2.9.6/src/CegoJoinObject.cc
---- cego-2.9.6/src/CegoJoinObject.cc.orig	2010-09-07 23:31:17.000000000 +0200
-+++ cego-2.9.6/src/CegoJoinObject.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoJoinObject.cc
+--- cego-2.10.1/src/CegoJoinObject.cc.orig	2011-06-23 17:38:41.000000000 +0200
++++ cego-2.10.1/src/CegoJoinObject.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -349,9 +349,9 @@ Index: cego-2.9.6/src/CegoJoinObject.cc
  // base includes
  #include <lfc/Tokenizer.h>
  
-Index: cego-2.9.6/src/CegoKeyObject.cc
---- cego-2.9.6/src/CegoKeyObject.cc.orig	2010-07-02 15:46:30.000000000 +0200
-+++ cego-2.9.6/src/CegoKeyObject.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoKeyObject.cc
+--- cego-2.10.1/src/CegoKeyObject.cc.orig	2010-11-21 01:44:30.000000000 +0100
++++ cego-2.10.1/src/CegoKeyObject.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -362,9 +362,9 @@ Index: cego-2.9.6/src/CegoKeyObject.cc
  // cego includes
  #include "CegoKeyObject.h"
  #include "CegoXMLdef.h"
-Index: cego-2.9.6/src/CegoLockHandler.cc
---- cego-2.9.6/src/CegoLockHandler.cc.orig	2010-09-07 23:31:47.000000000 +0200
-+++ cego-2.9.6/src/CegoLockHandler.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoLockHandler.cc
+--- cego-2.10.1/src/CegoLockHandler.cc.orig	2011-06-14 23:13:50.000000000 +0200
++++ cego-2.10.1/src/CegoLockHandler.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -375,9 +375,9 @@ Index: cego-2.9.6/src/CegoLockHandler.cc
  #ifndef _REENTRANT
  #define _REENTRANT    /* basic 3-lines for threads */
  #endif
-Index: cego-2.9.6/src/CegoLogManager.cc
---- cego-2.9.6/src/CegoLogManager.cc.orig	2010-09-07 23:33:04.000000000 +0200
-+++ cego-2.9.6/src/CegoLogManager.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoLogManager.cc
+--- cego-2.10.1/src/CegoLogManager.cc.orig	2010-11-21 01:45:28.000000000 +0100
++++ cego-2.10.1/src/CegoLogManager.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -388,9 +388,9 @@ Index: cego-2.9.6/src/CegoLogManager.cc
  // base includes
  #include <lfc/Exception.h>
  #include <lfc/File.h>
-Index: cego-2.9.6/src/CegoLogRecord.cc
---- cego-2.9.6/src/CegoLogRecord.cc.orig	2010-07-02 16:33:41.000000000 +0200
-+++ cego-2.9.6/src/CegoLogRecord.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoLogRecord.cc
+--- cego-2.10.1/src/CegoLogRecord.cc.orig	2011-06-21 00:28:35.000000000 +0200
++++ cego-2.10.1/src/CegoLogRecord.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -401,9 +401,9 @@ Index: cego-2.9.6/src/CegoLogRecord.cc
  // cego includes
  #include "CegoLogRecord.h"
  
-Index: cego-2.9.6/src/CegoObject.cc
---- cego-2.9.6/src/CegoObject.cc.orig	2010-07-02 16:44:05.000000000 +0200
-+++ cego-2.9.6/src/CegoObject.cc	2010-09-09 09:48:17.000000000 +0200
+Index: cego-2.10.1/src/CegoObject.cc
+--- cego-2.10.1/src/CegoObject.cc.orig	2011-06-21 00:01:01.000000000 +0200
++++ cego-2.10.1/src/CegoObject.cc	2011-06-25 10:31:27.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -414,18 +414,9 @@ Index: cego-2.9.6/src/CegoObject.cc
  // cego includes
  #include "CegoObject.h"
  
-Index: cego-2.9.6/src/Makefile.in
---- cego-2.9.6/src/Makefile.in.orig	2010-09-07 22:29:50.000000000 +0200
-+++ cego-2.9.6/src/Makefile.in	2010-09-09 09:48:17.000000000 +0200
-@@ -25,7 +25,7 @@
- # LDFLAGS = -static-libgcc
- LDFLAGS = -L$(LIBDIR) @LDFLAGS@
- # CFLAGS = -I$(INCDIR) @LDFLAGS@
--CFLAGS = -I$(INCDIR) -fPIC -O3 @CFLAGS@ @CPPFLAGS@
-+CFLAGS = -I$(INCDIR) -fPIC @CFLAGS@ @CPPFLAGS@
- RANLIB = @RANLIB@
- CGSHLIBOPT = @CGSHLIBOPT@
- WPSHLIBOPT = @WPSHLIBOPT@
+Index: cego-2.10.1/src/Makefile.in
+--- cego-2.10.1/src/Makefile.in.orig	2011-06-22 18:48:19.000000000 +0200
++++ cego-2.10.1/src/Makefile.in	2011-06-25 10:32:33.000000000 +0200
 @@ -60,10 +60,8 @@
  	$(STRIP) cgblow
  	$(INSTALL_PROGRAM) cgblow $(DESTDIR)$(CEGOBINDIR)
@@ -435,9 +426,9 @@ Index: cego-2.9.6/src/Makefile.in
  	$(INSTALL_DATA) libcgwrap.a $(DESTDIR)$(CEGOLIBDIR)
 -	$(INSTALL_DATA) libcgwrap.so.1 $(DESTDIR)$(CEGOLIBDIR)
  	$(RANLIB) $(DESTDIR)$(CEGOLIBDIR)/libcgwrap.a
+ 	$(INSTALL_DATA) CegoAdmNet.h $(DESTDIR)$(CEGOINCDIR)
  	$(INSTALL_DATA) CegoDbHandler.h $(DESTDIR)$(CEGOINCDIR)
- 	$(INSTALL_DATA) CegoField.h $(DESTDIR)$(CEGOINCDIR)
-@@ -229,12 +227,10 @@
+@@ -235,12 +233,10 @@
  	$(CCPLUS)  $(LDFLAGS) -o cgblow CegoBlowTab.o libcego.a $(LIBS) 
  
  libcego.a: $(LIBOBJECTS)
@@ -450,16 +441,9 @@ Index: cego-2.9.6/src/Makefile.in
  	$(AR) -r libcgwrap.a $(CGWRAPOBJECTS)
  	$(RANLIB) libcgwrap.a
  
-@@ -362,4 +358,4 @@
- CegoXMLSpace.o: CegoXMLSpace.cc CegoXMLSpace.h
- CegoXPorter.o: CegoXPorter.cc CegoXPorter.h
- CegoModule.o: CegoModule.cc CegoModule.h
--cgwrap.o: cgwrap.cc
-\ No newline at end of file
-+cgwrap.o: cgwrap.cc
-Index: lfc-1.1.37/src/Bitmap.cc
---- lfc-1.1.37/src/Bitmap.cc.orig	2010-08-15 13:48:09.000000000 +0200
-+++ lfc-1.1.37/src/Bitmap.cc	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/Bitmap.cc
+--- lfc-1.1.38/src/Bitmap.cc.orig	2010-08-15 13:48:09.000000000 +0200
++++ lfc-1.1.38/src/Bitmap.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <stdlib.h>
  
@@ -468,9 +452,9 @@ Index: lfc-1.1.37/src/Bitmap.cc
  #include "Bitmap.h"
  #include "Exception.h"
  
-Index: lfc-1.1.37/src/CommandExecuter.cc
---- lfc-1.1.37/src/CommandExecuter.cc.orig	2010-08-15 13:53:13.000000000 +0200
-+++ lfc-1.1.37/src/CommandExecuter.cc	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/CommandExecuter.cc
+--- lfc-1.1.38/src/CommandExecuter.cc.orig	2010-11-21 01:01:04.000000000 +0100
++++ lfc-1.1.38/src/CommandExecuter.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <fcntl.h>
  #include <signal.h>
@@ -479,9 +463,9 @@ Index: lfc-1.1.37/src/CommandExecuter.cc
  
  
  // BASE INCLUDES
-Index: lfc-1.1.37/src/Datetime.cc
---- lfc-1.1.37/src/Datetime.cc.orig	2010-08-15 13:48:19.000000000 +0200
-+++ lfc-1.1.37/src/Datetime.cc	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/Datetime.cc
+--- lfc-1.1.38/src/Datetime.cc.orig	2010-08-15 13:48:19.000000000 +0200
++++ lfc-1.1.38/src/Datetime.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -34,6 +34,8 @@
  
  #include <stdlib.h>
@@ -491,9 +475,9 @@ Index: lfc-1.1.37/src/Datetime.cc
  #include "Exception.h"
  #include "Datetime.h"
  
-Index: lfc-1.1.37/src/File.cc
---- lfc-1.1.37/src/File.cc.orig	2010-08-15 12:59:34.000000000 +0200
-+++ lfc-1.1.37/src/File.cc	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/File.cc
+--- lfc-1.1.38/src/File.cc.orig	2011-06-20 21:43:38.000000000 +0200
++++ lfc-1.1.38/src/File.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -48,6 +48,7 @@
  #include <fcntl.h>
  #include <unistd.h>
@@ -502,9 +486,9 @@ Index: lfc-1.1.37/src/File.cc
  
  // BASE INCLUDES
  #include "Exception.h"
-Index: lfc-1.1.37/src/Makefile.in
---- lfc-1.1.37/src/Makefile.in.orig	2010-09-05 12:08:54.000000000 +0200
-+++ lfc-1.1.37/src/Makefile.in	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/Makefile.in
+--- lfc-1.1.38/src/Makefile.in.orig	2010-09-17 10:00:58.000000000 +0200
++++ lfc-1.1.38/src/Makefile.in	2011-06-25 10:31:29.000000000 +0200
 @@ -85,7 +85,6 @@
  	$(INSTALL_DATA) Base64Coder.h $(DESTDIR)$(INCLUDEPREFIX)
  	if [ -f regex.o ]; then $(INSTALL_DATA) regex.h $(DESTDIR)$(INCLUDEPREFIX); fi
@@ -528,9 +512,9 @@ Index: lfc-1.1.37/src/Makefile.in
 -Base64Coder.o: Base64Coder.cc Base64Coder.h base64.c
 \ No newline at end of file
 +Base64Coder.o: Base64Coder.cc Base64Coder.h base64.c
-Index: lfc-1.1.37/src/Net.cc
---- lfc-1.1.37/src/Net.cc.orig	2010-08-15 13:45:10.000000000 +0200
-+++ lfc-1.1.37/src/Net.cc	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/Net.cc
+--- lfc-1.1.38/src/Net.cc.orig	2010-09-13 19:30:22.000000000 +0200
++++ lfc-1.1.38/src/Net.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -52,6 +52,7 @@
  #include <netdb.h>
  #endif
@@ -539,9 +523,9 @@ Index: lfc-1.1.37/src/Net.cc
  
  #include "Exception.h"
  #include "Net.h"
-Index: lfc-1.1.37/src/NetHandler.cc
---- lfc-1.1.37/src/NetHandler.cc.orig	2010-08-15 13:45:47.000000000 +0200
-+++ lfc-1.1.37/src/NetHandler.cc	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/NetHandler.cc
+--- lfc-1.1.38/src/NetHandler.cc.orig	2010-08-15 13:45:47.000000000 +0200
++++ lfc-1.1.38/src/NetHandler.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -38,6 +38,7 @@
  #define _REENTRANT    /* basic 3-lines for threads */
  #endif
@@ -550,9 +534,9 @@ Index: lfc-1.1.37/src/NetHandler.cc
  #include <unistd.h>
  #include <string.h>
  #include <sys/types.h>
-Index: lfc-1.1.37/src/Process.cc
---- lfc-1.1.37/src/Process.cc.orig	2010-08-15 13:51:29.000000000 +0200
-+++ lfc-1.1.37/src/Process.cc	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/Process.cc
+--- lfc-1.1.38/src/Process.cc.orig	2010-08-15 13:51:29.000000000 +0200
++++ lfc-1.1.38/src/Process.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -43,6 +43,7 @@
  #include <unistd.h>
  #include <string.h>
@@ -561,9 +545,9 @@ Index: lfc-1.1.37/src/Process.cc
  
  #include "Exception.h"
  #include "Chain.h"
-Index: lfc-1.1.37/src/Sleeper.cc
---- lfc-1.1.37/src/Sleeper.cc.orig	2010-08-15 13:50:23.000000000 +0200
-+++ lfc-1.1.37/src/Sleeper.cc	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/Sleeper.cc
+--- lfc-1.1.38/src/Sleeper.cc.orig	2010-08-15 13:50:23.000000000 +0200
++++ lfc-1.1.38/src/Sleeper.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -48,6 +48,7 @@
  #include <unistd.h>
  #include <string.h>
@@ -572,9 +556,9 @@ Index: lfc-1.1.37/src/Sleeper.cc
  
  #include "Exception.h"
  #include "Chain.h"
-Index: lfc-1.1.37/src/ThreadLock.cc
---- lfc-1.1.37/src/ThreadLock.cc.orig	2010-08-15 13:46:39.000000000 +0200
-+++ lfc-1.1.37/src/ThreadLock.cc	2010-09-09 09:48:18.000000000 +0200
+Index: lfc-1.1.38/src/ThreadLock.cc
+--- lfc-1.1.38/src/ThreadLock.cc.orig	2011-06-13 12:12:07.000000000 +0200
++++ lfc-1.1.38/src/ThreadLock.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -43,6 +43,7 @@
  #include <errno.h>
  #include <string.h>
@@ -584,8 +568,8 @@ Index: lfc-1.1.37/src/ThreadLock.cc
  
  #include "ThreadLock.h"
 Index: lfcxml-1.0.25/src/Makefile.in
---- lfcxml-1.0.25/src/Makefile.in.orig	2010-09-07 22:34:00.000000000 +0200
-+++ lfcxml-1.0.25/src/Makefile.in	2010-09-09 09:48:18.000000000 +0200
+--- lfcxml-1.0.25/src/Makefile.in.orig	2010-09-17 10:01:17.000000000 +0200
++++ lfcxml-1.0.25/src/Makefile.in	2011-06-25 10:31:29.000000000 +0200
 @@ -51,7 +51,6 @@
  	$(INSTALL_DATA) XMLInStream.h $(DESTDIR)$(XMLINCLUDEPATH)
  	$(INSTALL_DATA) XMLOutStream.h $(DESTDIR)$(XMLINCLUDEPATH)
@@ -603,13 +587,13 @@ Index: lfcxml-1.0.25/src/Makefile.in
  	$(RANLIB) liblfcxml.a
  
 Index: lfcxml-1.0.25/src/XMLSuite.cc
---- lfcxml-1.0.25/src/XMLSuite.cc.orig	2009-05-09 17:00:45.000000000 +0200
-+++ lfcxml-1.0.25/src/XMLSuite.cc	2010-09-09 09:48:18.000000000 +0200
+--- lfcxml-1.0.25/src/XMLSuite.cc.orig	2010-11-21 01:08:13.000000000 +0100
++++ lfcxml-1.0.25/src/XMLSuite.cc	2011-06-25 10:31:29.000000000 +0200
 @@ -35,6 +35,7 @@
  
  // INCLUDES
  #include "XMLSuite.h"
 +#include <stdlib.h>
  
- XMLSuite::XMLSuite(char *pC) : XML()  
- {
+ #include <stdlib.h>
+ 

+ 3 - 3
cego/cego.spec

@@ -24,8 +24,8 @@
 #   FIXME: rse: seems to have problems during building if old version is still installed
 
 #   package version
-%define       V_cego     2.9.6
-%define       V_lfc      1.1.37
+%define       V_cego     2.10.1
+%define       V_lfc      1.1.38
 %define       V_lfcxml   1.0.25
 %define       V_jdbc     1.3.3
 
@@ -40,7 +40,7 @@ Class:        EVAL
 Group:        Database
 License:      GPL
 Version:      %{V_cego}
-Release:      20110617
+Release:      20110625
 
 #   package options
 %option       with_jdbc   no