upgrading package: cego 2.6.11 -> 2.6.12

cego/cego.patch

@@ -1,132 +1,18 @@
-Index: base/src/Bitmap.cc
---- base/src/Bitmap.cc.orig	2007-07-06 08:47:23.000000000 +0200
-+++ base/src/Bitmap.cc	2010-08-09 09:35:18.000000000 +0200
-@@ -34,6 +34,7 @@
- 
- 
- // INCLUDES
-+#include <stdlib.h>
- #include "Bitmap.h"
- #include "Exception.h"
- 
-Index: base/src/CommandExecuter.cc
---- base/src/CommandExecuter.cc.orig	2009-05-28 18:50:57.000000000 +0200
-+++ base/src/CommandExecuter.cc	2010-08-09 09:35:18.000000000 +0200
-@@ -39,6 +39,7 @@
- #include <fcntl.h>
- #include <signal.h>
- #include <sys/wait.h>
-+#include <string.h>
- 
- 
- // BASE INCLUDES
-Index: base/src/Datetime.cc
---- base/src/Datetime.cc.orig	2009-04-03 17:42:07.000000000 +0200
-+++ base/src/Datetime.cc	2010-08-09 09:35:18.000000000 +0200
-@@ -33,6 +33,8 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- 
-+#include <string.h>
-+#include <stdlib.h>
- #include "Exception.h"
- #include "Datetime.h"
- 
-Index: base/src/File.cc
---- base/src/File.cc.orig	2009-06-11 14:14:25.000000000 +0200
-+++ base/src/File.cc	2010-08-09 09:35:18.000000000 +0200
-@@ -47,6 +47,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <string.h>
- 
- // BASE INCLUDES
- #include "Exception.h"
-Index: base/src/Makefile.in
---- base/src/Makefile.in.orig	2010-06-25 12:10:22.000000000 +0200
-+++ base/src/Makefile.in	2010-08-09 09:35:18.000000000 +0200
-@@ -85,7 +85,6 @@
- 	$(INSTALL_DATA) Base64Coder.h $(DESTDIR)$(INCLUDEPREFIX)
- 	if [ -f regex.o ]; then $(INSTALL_DATA) regex.h $(DESTDIR)$(INCLUDEPREFIX); fi
- 	$(INSTALL_DATA) libBase.a $(DESTDIR)$(LIBPREFIX)
--	$(INSTALL_DATA) libBase.so.1 $(DESTDIR)$(LIBPREFIX)
- 	$(RANLIB) $(DESTDIR)$(LIBPREFIX)/libBase.a
- 
- clean:
-@@ -99,7 +98,6 @@
- #################
- 
- libbase: $(OBJECTS)
--	$(CC) $(LDFLAGS) $(SHLIBOPT) -o libBase.so.1 $(OBJECTS)
- 	$(AR) -r libBase.a $(OBJECTS)
- 	$(RANLIB) libBase.a
- 
-@@ -135,4 +133,4 @@
- CommandExecuter.o: CommandExecuter.cc CommandExecuter.h
- Sleeper.o: Sleeper.cc Sleeper.h
- Process.o: Process.cc Process.h
--Base64Coder.o: Base64Coder.cc Base64Coder.h base64.c
-\ No newline at end of file
-+Base64Coder.o: Base64Coder.cc Base64Coder.h base64.c
-Index: base/src/Net.cc
---- base/src/Net.cc.orig	2010-06-24 20:10:04.000000000 +0200
-+++ base/src/Net.cc	2010-08-09 09:35:18.000000000 +0200
-@@ -50,6 +50,7 @@
- #include <netdb.h>
- #endif
- #include <errno.h>
-+#include <string.h>
- 
- #include "Exception.h"
- #include "Net.h"
-Index: base/src/NetHandler.cc
---- base/src/NetHandler.cc.orig	2010-06-24 20:07:04.000000000 +0200
-+++ base/src/NetHandler.cc	2010-08-09 09:35:18.000000000 +0200
-@@ -38,6 +38,7 @@
- #define _REENTRANT    /* basic 3-lines for threads */
- #endif
- 
-+#include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- 
-Index: base/src/Process.cc
---- base/src/Process.cc.orig	2007-08-03 21:34:16.000000000 +0200
-+++ base/src/Process.cc	2010-08-09 09:35:18.000000000 +0200
-@@ -43,6 +43,7 @@
- 
- #include <unistd.h>
- #include <errno.h>
-+#include <string.h>
- 
- #include "Exception.h"
- #include "Chain.h"
-Index: base/src/Sleeper.cc
---- base/src/Sleeper.cc.orig	2007-08-13 17:05:56.000000000 +0200
-+++ base/src/Sleeper.cc	2010-08-09 09:35:18.000000000 +0200
-@@ -47,6 +47,7 @@
- #include <time.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <string.h>
+Index: cego-2.6.12/Makefile.in
+--- cego-2.6.12/Makefile.in.orig	2010-08-21 15:57:58.000000000 +0200
++++ cego-2.6.12/Makefile.in	2010-09-06 17:06:28.000000000 +0200
+@@ -35,8 +35,6 @@
  
- #include "Exception.h"
- #include "Chain.h"
-Index: base/src/ThreadLock.cc
---- base/src/ThreadLock.cc.orig	2009-04-03 22:41:51.000000000 +0200
-+++ base/src/ThreadLock.cc	2010-08-09 09:35:18.000000000 +0200
-@@ -43,6 +43,7 @@
- #endif
- #include <errno.h>
- #include <time.h>
-+#include <string.h>
- #include <iostream>
+ all:
+ 	( cd src; make all )	
+-	( cd samples/cgwtest; make all )
+-	( cd samples/cgplustest; make all )
  
- #include "ThreadLock.h"
-Index: cego/src/CegoAdminThreadPool.cc
---- cego/src/CegoAdminThreadPool.cc.orig	2010-07-02 14:27:52.000000000 +0200
-+++ cego/src/CegoAdminThreadPool.cc	2010-08-09 09:41:48.000000000 +0200
+ install:
+ 	( cd src; make install )
+Index: cego-2.6.12/src/CegoAdminThreadPool.cc
+--- cego-2.6.12/src/CegoAdminThreadPool.cc.orig	2010-07-02 14:27:52.000000000 +0200
++++ cego-2.6.12/src/CegoAdminThreadPool.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -135,9 +21,9 @@ Index: cego/src/CegoAdminThreadPool.cc
  #include "CegoAdminThreadPool.h"
  
  #include "Sleeper.h"
-Index: cego/src/CegoAggregation.cc
---- cego/src/CegoAggregation.cc.orig	2010-07-02 14:28:35.000000000 +0200
-+++ cego/src/CegoAggregation.cc	2010-08-09 09:42:10.000000000 +0200
+Index: cego-2.6.12/src/CegoAggregation.cc
+--- cego-2.6.12/src/CegoAggregation.cc.orig	2010-07-02 14:28:35.000000000 +0200
++++ cego-2.6.12/src/CegoAggregation.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -34,6 +34,7 @@
  ///////////////////////////////////////////////////////////////////////////////
  
@@ -146,9 +32,9 @@ Index: cego/src/CegoAggregation.cc
  #include "CegoAggregation.h"
  #include "CegoFactor.h"
  #include "CegoXMLdef.h"
-Index: cego/src/CegoAttrDesc.cc
---- cego/src/CegoAttrDesc.cc.orig	2010-07-02 14:30:52.000000000 +0200
-+++ cego/src/CegoAttrDesc.cc	2010-08-09 09:42:23.000000000 +0200
+Index: cego-2.6.12/src/CegoAttrDesc.cc
+--- cego-2.6.12/src/CegoAttrDesc.cc.orig	2010-07-02 14:30:52.000000000 +0200
++++ cego-2.6.12/src/CegoAttrDesc.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -157,9 +43,9 @@ Index: cego/src/CegoAttrDesc.cc
  #include "CegoAttrDesc.h"
  #include "CegoXMLdef.h"
  
-Index: cego/src/CegoBlob.cc
---- cego/src/CegoBlob.cc.orig	2010-07-02 14:33:15.000000000 +0200
-+++ cego/src/CegoBlob.cc	2010-08-09 09:42:47.000000000 +0200
+Index: cego-2.6.12/src/CegoBlob.cc
+--- cego-2.6.12/src/CegoBlob.cc.orig	2010-07-02 14:33:15.000000000 +0200
++++ cego-2.6.12/src/CegoBlob.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,8 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -169,9 +55,9 @@ Index: cego/src/CegoBlob.cc
  #include "CegoBlob.h"
  #include "Exception.h"
  #include "File.h"
-Index: cego/src/CegoBufferPage.cc
---- cego/src/CegoBufferPage.cc.orig	2010-07-02 14:34:36.000000000 +0200
-+++ cego/src/CegoBufferPage.cc	2010-08-09 09:43:10.000000000 +0200
+Index: cego-2.6.12/src/CegoBufferPage.cc
+--- cego-2.6.12/src/CegoBufferPage.cc.orig	2010-07-02 14:34:36.000000000 +0200
++++ cego-2.6.12/src/CegoBufferPage.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -180,9 +66,9 @@ Index: cego/src/CegoBufferPage.cc
  #include "Exception.h"
  
  #include "CegoDefs.h"
-Index: cego/src/CegoBufferPool.cc
---- cego/src/CegoBufferPool.cc.orig	2010-07-02 14:35:19.000000000 +0200
-+++ cego/src/CegoBufferPool.cc	2010-08-09 09:43:27.000000000 +0200
+Index: cego-2.6.12/src/CegoBufferPool.cc
+--- cego-2.6.12/src/CegoBufferPool.cc.orig	2010-07-02 14:35:19.000000000 +0200
++++ cego-2.6.12/src/CegoBufferPool.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,8 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -192,9 +78,9 @@ Index: cego/src/CegoBufferPool.cc
  #include "Exception.h"
  #include "CommandExecuter.h"
  #include "Datetime.h"
-Index: cego/src/CegoCheckObject.cc
---- cego/src/CegoCheckObject.cc.orig	2010-07-02 14:36:19.000000000 +0200
-+++ cego/src/CegoCheckObject.cc	2010-08-09 09:43:49.000000000 +0200
+Index: cego-2.6.12/src/CegoCheckObject.cc
+--- cego-2.6.12/src/CegoCheckObject.cc.orig	2010-07-02 14:36:19.000000000 +0200
++++ cego-2.6.12/src/CegoCheckObject.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -203,9 +89,9 @@ Index: cego/src/CegoCheckObject.cc
  #include "CegoCheckObject.h"
  #include "CegoXMLdef.h"
  #include "CegoXMLHelper.h"
-Index: cego/src/CegoClient.cc
---- cego/src/CegoClient.cc.orig	2010-07-02 14:36:47.000000000 +0200
-+++ cego/src/CegoClient.cc	2010-08-09 09:35:18.000000000 +0200
+Index: cego-2.6.12/src/CegoClient.cc
+--- cego-2.6.12/src/CegoClient.cc.orig	2010-09-05 12:15:22.000000000 +0200
++++ cego-2.6.12/src/CegoClient.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -214,9 +100,9 @@ Index: cego/src/CegoClient.cc
  #include <locale.h>
  #include <stdlib.h>
  #include <stdio.h>
-Index: cego/src/CegoCondDesc.cc
---- cego/src/CegoCondDesc.cc.orig	2010-07-02 14:37:41.000000000 +0200
-+++ cego/src/CegoCondDesc.cc	2010-08-09 09:44:05.000000000 +0200
+Index: cego-2.6.12/src/CegoCondDesc.cc
+--- cego-2.6.12/src/CegoCondDesc.cc.orig	2010-07-02 14:37:41.000000000 +0200
++++ cego-2.6.12/src/CegoCondDesc.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -225,9 +111,9 @@ Index: cego/src/CegoCondDesc.cc
  #include "CegoCondDesc.h"
  #include "CegoXMLdef.h"
  
-Index: cego/src/CegoContentObject.cc
---- cego/src/CegoContentObject.cc.orig	2010-07-02 14:42:29.000000000 +0200
-+++ cego/src/CegoContentObject.cc	2010-08-09 09:44:23.000000000 +0200
+Index: cego-2.6.12/src/CegoContentObject.cc
+--- cego-2.6.12/src/CegoContentObject.cc.orig	2010-07-02 14:42:29.000000000 +0200
++++ cego-2.6.12/src/CegoContentObject.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -34,6 +34,8 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -237,9 +123,9 @@ Index: cego/src/CegoContentObject.cc
  #include "CegoContentObject.h"
  #include "CegoTypeConverter.h"
  
-Index: cego/src/CegoDataPointer.cc
---- cego/src/CegoDataPointer.cc.orig	2010-07-02 14:43:06.000000000 +0200
-+++ cego/src/CegoDataPointer.cc	2010-08-09 09:44:41.000000000 +0200
+Index: cego-2.6.12/src/CegoDataPointer.cc
+--- cego-2.6.12/src/CegoDataPointer.cc.orig	2010-07-02 14:43:06.000000000 +0200
++++ cego-2.6.12/src/CegoDataPointer.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -248,9 +134,9 @@ Index: cego/src/CegoDataPointer.cc
  #include "CegoDataPointer.h"
  
  CegoDataPointer::CegoDataPointer()
-Index: cego/src/CegoDbHandler.cc
---- cego/src/CegoDbHandler.cc.orig	2010-07-26 15:58:06.000000000 +0200
-+++ cego/src/CegoDbHandler.cc	2010-08-09 09:45:29.000000000 +0200
+Index: cego-2.6.12/src/CegoDbHandler.cc
+--- cego-2.6.12/src/CegoDbHandler.cc.orig	2010-08-27 10:02:59.000000000 +0200
++++ cego-2.6.12/src/CegoDbHandler.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,8 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -260,9 +146,9 @@ Index: cego/src/CegoDbHandler.cc
  #include "AESCrypt.h"
  #include "Datetime.h"
  
-Index: cego/src/CegoDbThread.cc
---- cego/src/CegoDbThread.cc.orig	2010-07-26 15:54:18.000000000 +0200
-+++ cego/src/CegoDbThread.cc	2010-08-09 09:45:09.000000000 +0200
+Index: cego-2.6.12/src/CegoDbThread.cc
+--- cego-2.6.12/src/CegoDbThread.cc.orig	2010-08-19 15:12:00.000000000 +0200
++++ cego-2.6.12/src/CegoDbThread.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -39,6 +39,7 @@
  ///////////////////////////////////////////////////////////////////////////////
  
@@ -271,9 +157,9 @@ Index: cego/src/CegoDbThread.cc
  #include "Exception.h"
  #include "Sleeper.h"
  
-Index: cego/src/CegoDbThreadPool.cc
---- cego/src/CegoDbThreadPool.cc.orig	2010-07-02 14:49:31.000000000 +0200
-+++ cego/src/CegoDbThreadPool.cc	2010-08-09 09:44:58.000000000 +0200
+Index: cego-2.6.12/src/CegoDbThreadPool.cc
+--- cego-2.6.12/src/CegoDbThreadPool.cc.orig	2010-07-02 14:49:31.000000000 +0200
++++ cego-2.6.12/src/CegoDbThreadPool.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,7 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -282,9 +168,9 @@ Index: cego/src/CegoDbThreadPool.cc
  #include "Exception.h"
  #include "Host.h"
  #include "NetHandler.h"
-Index: cego/src/CegoDefs.h
---- cego/src/CegoDefs.h.orig	2010-07-26 19:26:23.000000000 +0200
-+++ cego/src/CegoDefs.h	2010-08-09 09:48:57.000000000 +0200
+Index: cego-2.6.12/src/CegoDefs.h
+--- cego-2.6.12/src/CegoDefs.h.orig	2010-09-05 11:51:24.000000000 +0200
++++ cego-2.6.12/src/CegoDefs.h	2010-09-06 17:06:28.000000000 +0200
 @@ -35,6 +35,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -295,9 +181,9 @@ Index: cego/src/CegoDefs.h
  #ifdef HAVE_MINGW32
  #include <windows.h>
  #endif
-Index: cego/src/CegoDistManager.cc
---- cego/src/CegoDistManager.cc.orig	2010-07-26 15:58:05.000000000 +0200
-+++ cego/src/CegoDistManager.cc	2010-08-09 09:45:45.000000000 +0200
+Index: cego-2.6.12/src/CegoDistManager.cc
+--- cego-2.6.12/src/CegoDistManager.cc.orig	2010-08-22 10:13:55.000000000 +0200
++++ cego-2.6.12/src/CegoDistManager.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -308,9 +194,9 @@ Index: cego/src/CegoDistManager.cc
  #include "CegoDistManager.h"
  
  #include "Exception.h"
-Index: cego/src/CegoExpOutStream.cc
---- cego/src/CegoExpOutStream.cc.orig	2010-07-02 15:11:08.000000000 +0200
-+++ cego/src/CegoExpOutStream.cc	2010-08-09 09:46:18.000000000 +0200
+Index: cego-2.6.12/src/CegoExpOutStream.cc
+--- cego-2.6.12/src/CegoExpOutStream.cc.orig	2010-07-02 15:11:08.000000000 +0200
++++ cego-2.6.12/src/CegoExpOutStream.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -321,9 +207,9 @@ Index: cego/src/CegoExpOutStream.cc
  // base includes
  #include "Base64Coder.h"
  
-Index: cego/src/CegoExpr.cc
---- cego/src/CegoExpr.cc.orig	2010-07-02 15:09:45.000000000 +0200
-+++ cego/src/CegoExpr.cc	2010-08-09 09:46:09.000000000 +0200
+Index: cego-2.6.12/src/CegoExpr.cc
+--- cego-2.6.12/src/CegoExpr.cc.orig	2010-07-02 15:09:45.000000000 +0200
++++ cego-2.6.12/src/CegoExpr.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -334,9 +220,9 @@ Index: cego/src/CegoExpr.cc
  #include "CegoExpr.h"
  
  #include "CegoXMLdef.h"
-Index: cego/src/CegoFactor.cc
---- cego/src/CegoFactor.cc.orig	2010-07-26 20:05:10.000000000 +0200
-+++ cego/src/CegoFactor.cc	2010-08-09 09:46:28.000000000 +0200
+Index: cego-2.6.12/src/CegoFactor.cc
+--- cego-2.6.12/src/CegoFactor.cc.orig	2010-07-26 20:05:10.000000000 +0200
++++ cego-2.6.12/src/CegoFactor.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  // 
  ///////////////////////////////////////////////////////////////////////////////
@@ -347,9 +233,9 @@ Index: cego/src/CegoFactor.cc
  // INCLUDES
  #include "Exception.h"
  #include "CegoFactor.h"
-Index: cego/src/CegoFieldValue.cc
---- cego/src/CegoFieldValue.cc.orig	2010-07-23 14:58:56.000000000 +0200
-+++ cego/src/CegoFieldValue.cc	2010-08-09 09:46:40.000000000 +0200
+Index: cego-2.6.12/src/CegoFieldValue.cc
+--- cego-2.6.12/src/CegoFieldValue.cc.orig	2010-07-23 14:58:56.000000000 +0200
++++ cego-2.6.12/src/CegoFieldValue.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -360,9 +246,9 @@ Index: cego/src/CegoFieldValue.cc
  #include "CegoFieldValue.h"
  
  #include "Exception.h"
-Index: cego/src/CegoFunction.cc
---- cego/src/CegoFunction.cc.orig	2010-07-26 21:15:28.000000000 +0200
-+++ cego/src/CegoFunction.cc	2010-08-09 09:46:52.000000000 +0200
+Index: cego-2.6.12/src/CegoFunction.cc
+--- cego-2.6.12/src/CegoFunction.cc.orig	2010-07-26 21:15:28.000000000 +0200
++++ cego-2.6.12/src/CegoFunction.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -373,9 +259,9 @@ Index: cego/src/CegoFunction.cc
  #include "Datetime.h"
  #include "Tokenizer.h"
  
-Index: cego/src/CegoGroupEntry.cc
---- cego/src/CegoGroupEntry.cc.orig	2010-07-02 15:25:07.000000000 +0200
-+++ cego/src/CegoGroupEntry.cc	2010-08-09 09:47:05.000000000 +0200
+Index: cego-2.6.12/src/CegoGroupEntry.cc
+--- cego-2.6.12/src/CegoGroupEntry.cc.orig	2010-07-02 15:25:07.000000000 +0200
++++ cego-2.6.12/src/CegoGroupEntry.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -386,9 +272,9 @@ Index: cego/src/CegoGroupEntry.cc
  // base includes
  #include "Exception.h"
  
-Index: cego/src/CegoGroupSpace.cc
---- cego/src/CegoGroupSpace.cc.orig	2010-07-02 15:27:32.000000000 +0200
-+++ cego/src/CegoGroupSpace.cc	2010-08-09 09:47:13.000000000 +0200
+Index: cego-2.6.12/src/CegoGroupSpace.cc
+--- cego-2.6.12/src/CegoGroupSpace.cc.orig	2010-07-02 15:27:32.000000000 +0200
++++ cego-2.6.12/src/CegoGroupSpace.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -399,9 +285,9 @@ Index: cego/src/CegoGroupSpace.cc
  // base includes
  #include "Exception.h"
  
-Index: cego/src/CegoImpInStream.cc
---- cego/src/CegoImpInStream.cc.orig	2010-07-02 15:31:03.000000000 +0200
-+++ cego/src/CegoImpInStream.cc	2010-08-09 09:47:22.000000000 +0200
+Index: cego-2.6.12/src/CegoImpInStream.cc
+--- cego-2.6.12/src/CegoImpInStream.cc.orig	2010-08-19 15:14:48.000000000 +0200
++++ cego-2.6.12/src/CegoImpInStream.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -412,9 +298,9 @@ Index: cego/src/CegoImpInStream.cc
  // base includes
  #include "Base64Coder.h"
  
-Index: cego/src/CegoIndexCursor.cc
---- cego/src/CegoIndexCursor.cc.orig	2010-07-02 15:33:44.000000000 +0200
-+++ cego/src/CegoIndexCursor.cc	2010-08-09 09:47:31.000000000 +0200
+Index: cego-2.6.12/src/CegoIndexCursor.cc
+--- cego-2.6.12/src/CegoIndexCursor.cc.orig	2010-07-02 15:33:44.000000000 +0200
++++ cego-2.6.12/src/CegoIndexCursor.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -34,6 +34,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -425,9 +311,9 @@ Index: cego/src/CegoIndexCursor.cc
  // cego includes
  #include "CegoIndexCursor.h"
  #include "CegoTupleState.h"
-Index: cego/src/CegoIndexEntry.cc
---- cego/src/CegoIndexEntry.cc.orig	2010-07-02 15:37:21.000000000 +0200
-+++ cego/src/CegoIndexEntry.cc	2010-08-09 09:47:38.000000000 +0200
+Index: cego-2.6.12/src/CegoIndexEntry.cc
+--- cego-2.6.12/src/CegoIndexEntry.cc.orig	2010-07-02 15:37:21.000000000 +0200
++++ cego-2.6.12/src/CegoIndexEntry.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -438,9 +324,9 @@ Index: cego/src/CegoIndexEntry.cc
  // base includes
  #include "Exception.h"
  
-Index: cego/src/CegoIndexManager.cc
---- cego/src/CegoIndexManager.cc.orig	2010-07-02 15:38:52.000000000 +0200
-+++ cego/src/CegoIndexManager.cc	2010-08-09 09:47:46.000000000 +0200
+Index: cego-2.6.12/src/CegoIndexManager.cc
+--- cego-2.6.12/src/CegoIndexManager.cc.orig	2010-08-20 11:07:47.000000000 +0200
++++ cego-2.6.12/src/CegoIndexManager.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -451,9 +337,9 @@ Index: cego/src/CegoIndexManager.cc
  // base includes
  #include "Exception.h"
  
-Index: cego/src/CegoJoinObject.cc
---- cego/src/CegoJoinObject.cc.orig	2010-08-07 11:57:57.000000000 +0200
-+++ cego/src/CegoJoinObject.cc	2010-08-09 09:48:00.000000000 +0200
+Index: cego-2.6.12/src/CegoJoinObject.cc
+--- cego-2.6.12/src/CegoJoinObject.cc.orig	2010-08-07 11:57:57.000000000 +0200
++++ cego-2.6.12/src/CegoJoinObject.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -464,9 +350,9 @@ Index: cego/src/CegoJoinObject.cc
  // base includes
  #include "Tokenizer.h"
  
-Index: cego/src/CegoKeyObject.cc
---- cego/src/CegoKeyObject.cc.orig	2010-07-02 15:46:30.000000000 +0200
-+++ cego/src/CegoKeyObject.cc	2010-08-09 09:48:11.000000000 +0200
+Index: cego-2.6.12/src/CegoKeyObject.cc
+--- cego-2.6.12/src/CegoKeyObject.cc.orig	2010-07-02 15:46:30.000000000 +0200
++++ cego-2.6.12/src/CegoKeyObject.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -477,9 +363,9 @@ Index: cego/src/CegoKeyObject.cc
  // cego includes
  #include "CegoKeyObject.h"
  #include "CegoXMLdef.h"
-Index: cego/src/CegoLockHandler.cc
---- cego/src/CegoLockHandler.cc.orig	2010-07-02 15:53:55.000000000 +0200
-+++ cego/src/CegoLockHandler.cc	2010-08-09 09:48:22.000000000 +0200
+Index: cego-2.6.12/src/CegoLockHandler.cc
+--- cego-2.6.12/src/CegoLockHandler.cc.orig	2010-07-02 15:53:55.000000000 +0200
++++ cego-2.6.12/src/CegoLockHandler.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -490,9 +376,9 @@ Index: cego/src/CegoLockHandler.cc
  #ifndef _REENTRANT
  #define _REENTRANT    /* basic 3-lines for threads */
  #endif
-Index: cego/src/CegoLogManager.cc
---- cego/src/CegoLogManager.cc.orig	2010-07-02 16:02:11.000000000 +0200
-+++ cego/src/CegoLogManager.cc	2010-08-09 09:48:31.000000000 +0200
+Index: cego-2.6.12/src/CegoLogManager.cc
+--- cego-2.6.12/src/CegoLogManager.cc.orig	2010-08-13 10:15:58.000000000 +0200
++++ cego-2.6.12/src/CegoLogManager.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -503,9 +389,9 @@ Index: cego/src/CegoLogManager.cc
  // base includes
  #include "Exception.h"
  #include "File.h"
-Index: cego/src/CegoLogRecord.cc
---- cego/src/CegoLogRecord.cc.orig	2010-07-02 16:33:41.000000000 +0200
-+++ cego/src/CegoLogRecord.cc	2010-08-09 09:49:25.000000000 +0200
+Index: cego-2.6.12/src/CegoLogRecord.cc
+--- cego-2.6.12/src/CegoLogRecord.cc.orig	2010-07-02 16:33:41.000000000 +0200
++++ cego-2.6.12/src/CegoLogRecord.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -516,9 +402,9 @@ Index: cego/src/CegoLogRecord.cc
  // cego includes
  #include "CegoLogRecord.h"
  
-Index: cego/src/CegoObject.cc
---- cego/src/CegoObject.cc.orig	2010-07-02 16:44:05.000000000 +0200
-+++ cego/src/CegoObject.cc	2010-08-09 09:49:38.000000000 +0200
+Index: cego-2.6.12/src/CegoObject.cc
+--- cego-2.6.12/src/CegoObject.cc.orig	2010-07-02 16:44:05.000000000 +0200
++++ cego-2.6.12/src/CegoObject.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -529,9 +415,9 @@ Index: cego/src/CegoObject.cc
  // cego includes
  #include "CegoObject.h"
  
-Index: cego/src/CegoOrderEntry.cc
---- cego/src/CegoOrderEntry.cc.orig	2010-07-02 16:56:08.000000000 +0200
-+++ cego/src/CegoOrderEntry.cc	2010-08-09 09:49:47.000000000 +0200
+Index: cego-2.6.12/src/CegoOrderEntry.cc
+--- cego-2.6.12/src/CegoOrderEntry.cc.orig	2010-07-02 16:56:08.000000000 +0200
++++ cego-2.6.12/src/CegoOrderEntry.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -33,6 +33,9 @@
  //
  ///////////////////////////////////////////////////////////////////////////////
@@ -542,10 +428,10 @@ Index: cego/src/CegoOrderEntry.cc
  // base includes
  #include "Exception.h"
  
-Index: cego/src/Makefile.in
---- cego/src/Makefile.in.orig	2010-03-12 13:19:16.000000000 +0100
-+++ cego/src/Makefile.in	2010-08-09 09:35:18.000000000 +0200
-@@ -21,7 +21,7 @@
+Index: cego-2.6.12/src/Makefile.in
+--- cego-2.6.12/src/Makefile.in.orig	2010-09-05 12:11:20.000000000 +0200
++++ cego-2.6.12/src/Makefile.in	2010-09-06 17:06:28.000000000 +0200
+@@ -25,7 +25,7 @@
  # LDFLAGS = -static-libgcc
  LDFLAGS = -L$(LIBDIR) @LDFLAGS@
  # CFLAGS = -I$(INCDIR) @LDFLAGS@
@@ -554,19 +440,19 @@ Index: cego/src/Makefile.in
  RANLIB = @RANLIB@
  CGSHLIBOPT = @CGSHLIBOPT@
  WPSHLIBOPT = @WPSHLIBOPT@
-@@ -56,10 +56,8 @@
+@@ -60,10 +60,8 @@
  	$(STRIP) cgblow
- 	$(INSTALL_PROGRAM) cgblow $(DESTDIR)$(BINDIR)
- 	$(INSTALL_DATA) libcego.a $(DESTDIR)$(LIBDIR)
--	$(INSTALL_DATA) libcego.so.1 $(DESTDIR)$(LIBDIR)
- 	$(RANLIB) $(DESTDIR)$(LIBDIR)/libcego.a
- 	$(INSTALL_DATA) libcgwrap.a $(DESTDIR)$(LIBDIR)
--	$(INSTALL_DATA) libcgwrap.so.1 $(DESTDIR)$(LIBDIR)
- 	$(RANLIB) $(DESTDIR)$(LIBDIR)/libcgwrap.a
- 	$(INSTALL_DATA) CegoDbHandler.h $(DESTDIR)$(INCDIR)
- 	$(INSTALL_DATA) CegoField.h $(DESTDIR)$(INCDIR)
-@@ -226,12 +224,10 @@
- 	$(CC) $(LDFLAGS) -o cgwtest cgwtest.o libcgwrap.a libcego.a $(LIBS) -lstdc++
+ 	$(INSTALL_PROGRAM) cgblow $(DESTDIR)$(CEGOBINDIR)
+ 	$(INSTALL_DATA) libcego.a $(DESTDIR)$(CEGOLIBDIR)
+-	$(INSTALL_DATA) libcego.so.1 $(DESTDIR)$(CEGOLIBDIR)
+ 	$(RANLIB) $(DESTDIR)$(CEGOLIBDIR)/libcego.a
+ 	$(INSTALL_DATA) libcgwrap.a $(DESTDIR)$(CEGOLIBDIR)
+-	$(INSTALL_DATA) libcgwrap.so.1 $(DESTDIR)$(CEGOLIBDIR)
+ 	$(RANLIB) $(DESTDIR)$(CEGOLIBDIR)/libcgwrap.a
+ 	$(INSTALL_DATA) CegoDbHandler.h $(DESTDIR)$(CEGOINCDIR)
+ 	$(INSTALL_DATA) CegoField.h $(DESTDIR)$(CEGOINCDIR)
+@@ -229,12 +227,10 @@
+ 	$(CCPLUS)  $(LDFLAGS) -o cgblow CegoBlowTab.o libcego.a $(LIBS) 
  
  libcego.a: $(LIBOBJECTS)
 -	$(CC) $(LDFLAGS) $(CGSHLIBOPT) -o libcego.so.1 $(LIBOBJECTS)
@@ -578,35 +464,161 @@ Index: cego/src/Makefile.in
  	$(AR) -r libcgwrap.a $(CGWRAPOBJECTS)
  	$(RANLIB) libcgwrap.a
  
-@@ -359,4 +355,4 @@
+@@ -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: xml/src/Makefile.in
---- xml/src/Makefile.in.orig	2010-02-25 18:41:22.000000000 +0100
-+++ xml/src/Makefile.in	2010-08-09 09:35:18.000000000 +0200
+Index: lfc-1.1.33/src/Bitmap.cc
+--- lfc-1.1.33/src/Bitmap.cc.orig	2010-08-15 13:48:09.000000000 +0200
++++ lfc-1.1.33/src/Bitmap.cc	2010-09-06 17:06:28.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <stdlib.h>
+ 
+ // INCLUDES
++#include <stdlib.h>
+ #include "Bitmap.h"
+ #include "Exception.h"
+ 
+Index: lfc-1.1.33/src/CommandExecuter.cc
+--- lfc-1.1.33/src/CommandExecuter.cc.orig	2010-08-15 13:53:13.000000000 +0200
++++ lfc-1.1.33/src/CommandExecuter.cc	2010-09-06 17:06:28.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <fcntl.h>
+ #include <signal.h>
+ #include <sys/wait.h>
++#include <string.h>
+ 
+ 
+ // BASE INCLUDES
+Index: lfc-1.1.33/src/Datetime.cc
+--- lfc-1.1.33/src/Datetime.cc.orig	2010-08-15 13:48:19.000000000 +0200
++++ lfc-1.1.33/src/Datetime.cc	2010-09-06 17:06:28.000000000 +0200
+@@ -34,6 +34,8 @@
+ 
+ #include <stdlib.h>
+ 
++#include <string.h>
++#include <stdlib.h>
+ #include "Exception.h"
+ #include "Datetime.h"
+ 
+Index: lfc-1.1.33/src/File.cc
+--- lfc-1.1.33/src/File.cc.orig	2010-08-15 12:59:34.000000000 +0200
++++ lfc-1.1.33/src/File.cc	2010-09-06 17:06:28.000000000 +0200
+@@ -48,6 +48,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ // BASE INCLUDES
+ #include "Exception.h"
+Index: lfc-1.1.33/src/Makefile.in
+--- lfc-1.1.33/src/Makefile.in.orig	2010-09-05 12:08:54.000000000 +0200
++++ lfc-1.1.33/src/Makefile.in	2010-09-06 17:06:55.000000000 +0200
+@@ -85,7 +85,6 @@
+ 	$(INSTALL_DATA) Base64Coder.h $(DESTDIR)$(INCLUDEPREFIX)
+ 	if [ -f regex.o ]; then $(INSTALL_DATA) regex.h $(DESTDIR)$(INCLUDEPREFIX); fi
+ 	$(INSTALL_DATA) liblfc.a $(DESTDIR)$(LIBPREFIX)
+-	$(INSTALL_DATA) liblfc.so.1 $(DESTDIR)$(LIBPREFIX)
+ 	$(RANLIB) $(DESTDIR)$(LIBPREFIX)/liblfc.a
+ 
+ clean:
+@@ -99,7 +98,6 @@
+ #################
+ 
+ liblfc: $(OBJECTS)
+-	$(CC) $(LDFLAGS) $(SHLIBOPT) -o liblfc.so.1 $(OBJECTS)
+ 	$(AR) -r liblfc.a $(OBJECTS)
+ 	$(RANLIB) liblfc.a
+ 
+@@ -135,4 +133,4 @@
+ CommandExecuter.o: CommandExecuter.cc CommandExecuter.h
+ Sleeper.o: Sleeper.cc Sleeper.h
+ Process.o: Process.cc Process.h
+-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.33/src/Net.cc
+--- lfc-1.1.33/src/Net.cc.orig	2010-08-15 13:45:10.000000000 +0200
++++ lfc-1.1.33/src/Net.cc	2010-09-06 17:06:28.000000000 +0200
+@@ -52,6 +52,7 @@
+ #include <netdb.h>
+ #endif
+ #include <errno.h>
++#include <string.h>
+ 
+ #include "Exception.h"
+ #include "Net.h"
+Index: lfc-1.1.33/src/NetHandler.cc
+--- lfc-1.1.33/src/NetHandler.cc.orig	2010-08-15 13:45:47.000000000 +0200
++++ lfc-1.1.33/src/NetHandler.cc	2010-09-06 17:06:28.000000000 +0200
+@@ -38,6 +38,7 @@
+ #define _REENTRANT    /* basic 3-lines for threads */
+ #endif
+ 
++#include <string.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/types.h>
+Index: lfc-1.1.33/src/Process.cc
+--- lfc-1.1.33/src/Process.cc.orig	2010-08-15 13:51:29.000000000 +0200
++++ lfc-1.1.33/src/Process.cc	2010-09-06 17:06:28.000000000 +0200
+@@ -43,6 +43,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ #include "Exception.h"
+ #include "Chain.h"
+Index: lfc-1.1.33/src/Sleeper.cc
+--- lfc-1.1.33/src/Sleeper.cc.orig	2010-08-15 13:50:23.000000000 +0200
++++ lfc-1.1.33/src/Sleeper.cc	2010-09-06 17:06:28.000000000 +0200
+@@ -48,6 +48,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ #include "Exception.h"
+ #include "Chain.h"
+Index: lfc-1.1.33/src/ThreadLock.cc
+--- lfc-1.1.33/src/ThreadLock.cc.orig	2010-08-15 13:46:39.000000000 +0200
++++ lfc-1.1.33/src/ThreadLock.cc	2010-09-06 17:06:28.000000000 +0200
+@@ -43,6 +43,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <time.h>
++#include <string.h>
+ #include <iostream>
+ 
+ #include "ThreadLock.h"
+Index: lfcxml-1.0.21/src/Makefile.in
+--- lfcxml-1.0.21/src/Makefile.in.orig	2010-09-05 12:10:35.000000000 +0200
++++ lfcxml-1.0.21/src/Makefile.in	2010-09-06 17:06:28.000000000 +0200
 @@ -49,7 +49,6 @@
  	$(INSTALL_DATA) XMLInStream.h $(DESTDIR)$(INCLUDEPREFIX)
  	$(INSTALL_DATA) XMLOutStream.h $(DESTDIR)$(INCLUDEPREFIX)
- 	$(INSTALL_DATA) libXML.a $(DESTDIR)$(LIBPREFIX)
--	$(INSTALL_DATA) libXML.so.1 $(DESTDIR)$(LIBPREFIX)
- 	$(RANLIB) $(DESTDIR)$(LIBPREFIX)/libXML.a
+ 	$(INSTALL_DATA) liblfcxml.a $(DESTDIR)$(LIBPREFIX)
+-	$(INSTALL_DATA) liblfcxml.so.1 $(DESTDIR)$(LIBPREFIX)
+ 	$(RANLIB) $(DESTDIR)$(LIBPREFIX)/liblfcxml.a
  
  #################
 @@ -57,7 +56,6 @@
  #################
  
- libXML: $(OBJECTS)
--	$(CC) $(LDFLAGS) $(SHLIBOPT) -o libXML.so.1 $(OBJECTS)
- 	$(AR) -r libXML.a $(OBJECTS)
- 	$(RANLIB) libXML.a
+ liblfcxml: $(OBJECTS)
+-	$(CC) $(LDFLAGS) $(SHLIBOPT) -o liblfcxml.so.1 $(OBJECTS)
+ 	$(AR) -r liblfcxml.a $(OBJECTS)
+ 	$(RANLIB) liblfcxml.a
  
-Index: xml/src/XMLSuite.cc
---- xml/src/XMLSuite.cc.orig	2009-05-09 17:00:45.000000000 +0200
-+++ xml/src/XMLSuite.cc	2010-08-09 09:35:18.000000000 +0200
+Index: lfcxml-1.0.21/src/XMLSuite.cc
+--- lfcxml-1.0.21/src/XMLSuite.cc.orig	2009-05-09 17:00:45.000000000 +0200
++++ lfcxml-1.0.21/src/XMLSuite.cc	2010-09-06 17:06:28.000000000 +0200
 @@ -35,6 +35,7 @@
  
  // INCLUDES
@@ -615,15 +627,3 @@ Index: xml/src/XMLSuite.cc
  
  XMLSuite::XMLSuite(char *pC) : XML()  
  {
-Index: cego/Makefile.in
---- cego/Makefile.in.orig	2010-08-21 15:57:58.000000000 +0200
-+++ cego/Makefile.in	2010-08-30 15:25:22.000000000 +0200
-@@ -35,8 +35,6 @@
- 
- all:
- 	( cd src; make all )	
--	( cd samples/cgwtest; make all )
--	( cd samples/cgplustest; make all )
- 
- install:
- 	( cd src; make install )

cego/cego.spec

@@ -24,10 +24,10 @@
 #   FIXME: rse: seems to have problems during building if old version is still installed
 
 #   package version
-%define       V_cego  2.6.11
-%define       V_base  1.1.32
-%define       V_xml   1.0.20
-%define       V_jdbc  1.2.20
+%define       V_cego     2.6.12
+%define       V_lfc      1.1.33
+%define       V_lfcxml   1.0.21
+%define       V_jdbc     1.2.20
 
 #   package information
 Name:         cego
@@ -40,14 +40,14 @@ Class:        EVAL
 Group:        Database
 License:      GPL
 Version:      %{V_cego}
-Release:      20100830
+Release:      20100906
 
 #   package options
 %option       with_jdbc   no
 
 #   list of sources
-Source0:      http://www.lemke-it.com/base-%{V_base}.tar.gz
-Source1:      http://www.lemke-it.com/xml-%{V_xml}.tar.gz
+Source0:      http://www.lemke-it.com/lfc-%{V_lfc}.tar.gz
+Source1:      http://www.lemke-it.com/lfcxml-%{V_lfcxml}.tar.gz
 Source2:      http://www.lemke-it.com/cego-%{V_cego}.tar.gz
 Source3:      http://www.lemke-it.com/cegojdbc-%{V_jdbc}.jar
 Patch0:       cego.patch
@@ -73,15 +73,15 @@ PreReq:       java, JAVA-JDK
     node and this node gets the active node for the tableset.
 
 %track
-    prog cego:base = {
-        version   = %{V_base}
+    prog cego:lfc = {
+        version   = %{V_lfc}
         url       = http://www.lemke-it.com/opensource.html
         regex     = base-(__VER__)\.tar\.gz
     }
-    prog cego:xml = {
-        version   = %{V_xml}
+    prog cego:lfcxml = {
+        version   = %{V_lfcxml}
         url       = http://www.lemke-it.com/opensource.html
-        regex     = xml-(__VER__)\.tar\.gz
+        regex     = lfcxml-(__VER__)\.tar\.gz
     }
     prog cego:cego = {
         version   = %{V_cego}
@@ -101,7 +101,7 @@ PreReq:       java, JAVA-JDK
     %patch -p0
 
 %build
-    ( cd base
+    ( cd lfc-%{V_lfc}
       export CC="%{l_cc}"
       export CXX="%{l_cxx}"
       export CFLAGS="%{l_cflags -O}"
@@ -112,24 +112,24 @@ PreReq:       java, JAVA-JDK
           --prefix=%{l_prefix}
       %{l_make} %{l_mflags -O}
     ) || exit $?
-    ( cd xml
+    ( cd lfcxml-%{V_lfcxml}
       export CC="%{l_cc}"
       export CXX="%{l_cxx}"
       export CFLAGS="%{l_cflags -O}"
       export CXXFLAGS="%{l_cxxflags -O}"
-      export CPPFLAGS="%{l_cppflags} -I`pwd`/../base/src"
-      export LDFLAGS="%{l_ldflags} -L`pwd`/../base/src"
+      export CPPFLAGS="%{l_cppflags} -I`pwd`/../lfc-%{V_lfc}/src"
+      export LDFLAGS="%{l_ldflags} -L`pwd`/../lfc-%{V_lfc}/src"
       ./configure \
           --prefix=%{l_prefix}
       %{l_make} %{l_mflags -O}
     ) || exit $?
-    ( cd cego
+    ( cd cego-%{V_cego}
       export CC="%{l_cc}"
       export CXX="%{l_cxx}"
       export CFLAGS="%{l_cflags -O}"
       export CXXFLAGS="%{l_cxxflags -O}"
-      export CPPFLAGS="%{l_cppflags} -I`pwd`/../base/src -I`pwd`/../xml/src"
-      export LDFLAGS="%{l_ldflags} -L`pwd`/../base/src -L`pwd`/../xml/src"
+      export CPPFLAGS="%{l_cppflags} -I`pwd`/../lfc-%{V_lfc}/src -I`pwd`/../lfcxml-%{V_lfcxml}/src"
+      export LDFLAGS="%{l_ldflags} -L`pwd`/../lfc-%{V_lfc}/src -L`pwd`/../lfcxml-%{V_lfcxml}/src"
       export LIBS=""
       case "%{l_platform -t}" in
           *-linux*   ) LIBS="$LIBS -lcrypt" ;;
@@ -146,13 +146,13 @@ PreReq:       java, JAVA-JDK
         $RPM_BUILD_ROOT%{l_prefix}/bin \
         $RPM_BUILD_ROOT%{l_prefix}/lib \
         $RPM_BUILD_ROOT%{l_prefix}/include/cego
-    ( cd base
+    ( cd lfc-%{V_lfc}
       %{l_make} %{l_mflags} install PREFIX=$RPM_BUILD_ROOT%{l_prefix}
     ) || exit $?
-    ( cd xml
+    ( cd lfcxml-%{V_lfcxml}
       %{l_make} %{l_mflags} install PREFIX=$RPM_BUILD_ROOT%{l_prefix}
     ) || exit $?
-    ( cd cego
+    ( cd cego-%{V_cego}
       %{l_make} %{l_mflags} install PREFIX=$RPM_BUILD_ROOT%{l_prefix}
     ) || exit $?
 %if "%{with_jdbc}" == "yes"
@@ -162,8 +162,6 @@ PreReq:       java, JAVA-JDK
         %{SOURCE cegojdbc-%{V_jdbc}.jar} \
         $RPM_BUILD_ROOT%{l_prefix}/lib/cego/cego.jar
 %endif
-    mv $RPM_BUILD_ROOT%{l_prefix}/include/*.h \
-       $RPM_BUILD_ROOT%{l_prefix}/include/cego/
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}