OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 17-Mar-2009 16:34:24
Branch: HEAD Handle: 2009031715342300
Modified files:
openpkg-src/cego cego.patch cego.spec
Log:
upgrading package: cego 2.2.5 -> 2.2.6
Summary:
Revision Changes Path
1.13 +73 -77 openpkg-src/cego/cego.patch
1.38 +3 -3 openpkg-src/cego/cego.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cego/cego.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 cego.patch
--- openpkg-src/cego/cego.patch 1 Mar 2009 20:25:53 -0000 1.12
+++ openpkg-src/cego/cego.patch 17 Mar 2009 15:34:23 -0000 1.13
@@ -1,18 +1,18 @@
Index: cego/src/CegoContentObject.cc
---- cego/src/CegoContentObject.cc.orig 2008-06-10 23:07:04 +0200
-+++ cego/src/CegoContentObject.cc 2008-06-21 09:50:15 +0200
-@@ -277,7 +277,7 @@
+--- cego/src/CegoContentObject.cc.orig 2009-03-14 14:36:25 +0100
++++ cego/src/CegoContentObject.cc 2009-03-17 08:31:29 +0100
+@@ -303,7 +303,7 @@
s += Chain(" TableName: ") + pF->getTableName() + Chain("\n");
s += Chain(" TableAlias: ") + pF->getTableAlias() + Chain("\n");
s += Chain(" AttrName: ") + pF->getAttrName() + Chain("\n");
-- s += Chain(" Type: ") + CEGO_TYPE_MAP[pF->getFieldValue().getType()]
+ Chain("\n");
-+ s += Chain(" Type: ") +
CEGO_TYPE_MAP[pF->getFieldValue().getType()].c_str() + Chain("\n");
- s += Chain(" Len: ") + Chain(pF->getFieldValue().getLength()) +
Chain("\n");
+- s += Chain(" Type: ") + CEGO_TYPE_MAP[pF->getType()] + Chain("\n");
++ s += Chain(" Type: ") + CEGO_TYPE_MAP[pF->getType()].c_str() +
Chain("\n");
+ s += Chain(" Len: ") + Chain(pF->getLength()) + Chain("\n");
pF= _schema.Next();
Index: cego/src/CegoDataType.h
---- cego/src/CegoDataType.h.orig 2007-12-16 12:01:09 +0100
-+++ cego/src/CegoDataType.h 2008-06-21 09:50:15 +0200
+--- cego/src/CegoDataType.h.orig 2008-09-30 09:52:34 +0200
++++ cego/src/CegoDataType.h 2009-03-17 08:31:29 +0100
@@ -54,7 +54,7 @@
// this must be correlated to the enum above
@@ -22,22 +22,58 @@
{
"int",
"long",
+Index: cego/src/CegoField.cc
+--- cego/src/CegoField.cc.orig 2009-03-11 20:48:26 +0100
++++ cego/src/CegoField.cc 2009-03-17 08:31:29 +0100
+@@ -205,12 +205,12 @@
+ case BIGINT_TYPE:
+ case DECIMAL_TYPE:
+ {
+- s = CEGO_TYPE_MAP[_type] + Chain("(") + Chain(_len) + Chain(")");
++ s = CEGO_TYPE_MAP[_type].c_str() + Chain("(") + Chain(_len) +
Chain(")");
+ break;
+ }
+ default:
+ {
+- s = CEGO_TYPE_MAP[_type];
++ s = CEGO_TYPE_MAP[_type].c_str();
+ break;
+ }
+ }
+Index: cego/src/CegoFieldValue.cc
+--- cego/src/CegoFieldValue.cc.orig 2009-03-13 15:24:08 +0100
++++ cego/src/CegoFieldValue.cc 2009-03-17 08:31:29 +0100
+@@ -1583,12 +1583,12 @@
+ case BIGINT_TYPE:
+ case DECIMAL_TYPE:
+ {
+- s = CEGO_TYPE_MAP[_type] + Chain("(") + Chain(_len) + Chain(")");
++ s = CEGO_TYPE_MAP[_type].c_str() + Chain("(") + Chain(_len) +
Chain(")");
+ break;
+ }
+ default:
+ {
+- s = CEGO_TYPE_MAP[_type];
++ s = CEGO_TYPE_MAP[_type].c_str();
+ break;
+ }
+ }
Index: cego/src/CegoJDBCInfo.cc
---- cego/src/CegoJDBCInfo.cc.orig 2008-04-28 15:18:43 +0200
-+++ cego/src/CegoJDBCInfo.cc 2008-06-21 09:50:15 +0200
-@@ -381,7 +381,7 @@
+--- cego/src/CegoJDBCInfo.cc.orig 2009-03-11 22:00:17 +0100
++++ cego/src/CegoJDBCInfo.cc 2009-03-17 11:01:52 +0100
+@@ -566,7 +566,7 @@
f1.Insert( CegoFieldValue(VARCHAR_TYPE, *pTable));
f1.Insert( CegoFieldValue(VARCHAR_TYPE, pF->getAttrName()));
- f1.Insert( CegoFieldValue(INT_TYPE,
CEGO_JAVATYPE_MAP[pF->getFieldValue().getType()]));
-- f1.Insert( CegoFieldValue(VARCHAR_TYPE,
CEGO_TYPE_MAP[pF->getFieldValue().getType()]));
-+ f1.Insert( CegoFieldValue(VARCHAR_TYPE,
CEGO_TYPE_MAP[pF->getFieldValue().getType()].c_str()));
- f1.Insert( CegoFieldValue(INT_TYPE,
pF->getFieldValue().getLength()));
+ f1.Insert( CegoFieldValue(INT_TYPE,
CEGO_JAVATYPE_MAP[pF->getType()]));
+- f1.Insert( CegoFieldValue(VARCHAR_TYPE,
CEGO_TYPE_MAP[pF->getType()]));
++ f1.Insert( CegoFieldValue(VARCHAR_TYPE,
CEGO_TYPE_MAP[pF->getType()].c_str()));
+ f1.Insert( CegoFieldValue(INT_TYPE, pF->getLength()));
f1.Insert( CegoFieldValue()); // BUFFER_LENGTH not used
f1.Insert( CegoFieldValue(INT_TYPE, 0 ));
Index: cego/src/CegoOutput.cc
---- cego/src/CegoOutput.cc.orig 2008-06-02 13:35:52 +0200
-+++ cego/src/CegoOutput.cc 2008-06-21 09:50:15 +0200
-@@ -35,6 +35,7 @@
+--- cego/src/CegoOutput.cc.orig 2009-03-11 21:08:40 +0100
++++ cego/src/CegoOutput.cc 2009-03-17 08:31:29 +0100
+@@ -36,6 +36,7 @@
#include "Datetime.h"
#include "XMLSuite.h"
@@ -46,9 +82,9 @@
#include "CegoDefs.h"
Index: cego/src/CegoProcedure.cc
---- cego/src/CegoProcedure.cc.orig 2007-09-21 19:06:07 +0200
-+++ cego/src/CegoProcedure.cc 2008-06-21 09:50:15 +0200
-@@ -113,10 +113,10 @@
+--- cego/src/CegoProcedure.cc.orig 2009-03-01 12:58:53 +0100
++++ cego/src/CegoProcedure.cc 2009-03-17 08:31:29 +0100
+@@ -112,10 +112,10 @@
if ( fv.castTo(pVar->getValue().getType()) == false )
{
throw Exception(EXLOC, Chain("Mismatched datatype <")
@@ -62,9 +98,9 @@
}
Index: cego/src/CegoQueryHelper.cc
---- cego/src/CegoQueryHelper.cc.orig 2008-06-08 15:28:58 +0200
-+++ cego/src/CegoQueryHelper.cc 2008-06-21 09:50:15 +0200
-@@ -666,7 +666,7 @@
+--- cego/src/CegoQueryHelper.cc.orig 2009-03-14 14:40:48 +0100
++++ cego/src/CegoQueryHelper.cc 2009-03-17 08:31:29 +0100
+@@ -672,7 +672,7 @@
}
default:
{
@@ -73,72 +109,32 @@
throw Exception(EXLOC, msg);
break;
}
-@@ -754,10 +754,10 @@
- if ( fv.castTo(pFV->getFieldValue().getType()) == false )
+@@ -756,10 +756,10 @@
+ if ( fv.castTo(pFV->getType()) == false )
{
throw Exception(EXLOC, Chain("Mismatched datatype <")
- + CEGO_TYPE_MAP[(int)fv.getType()]
+ + CEGO_TYPE_MAP[(int)fv.getType()].c_str()
+ Chain("> in value list for argument ") +
Chain(pos)
+ " ( expected "
-- +
CEGO_TYPE_MAP[(int)pFV->getFieldValue().getType()] + " )");
-+ +
CEGO_TYPE_MAP[(int)pFV->getFieldValue().getType()].c_str() + " )");
+- + CEGO_TYPE_MAP[(int)pFV->getType()] + " )");
++ + CEGO_TYPE_MAP[(int)pFV->getType()].c_str() + "
)");
}
}
-
+
Index: cego/src/CegoTableManager.cc
---- cego/src/CegoTableManager.cc.orig 2008-06-20 21:40:34 +0200
-+++ cego/src/CegoTableManager.cc 2008-06-21 09:50:15 +0200
-@@ -1882,10 +1882,10 @@
- if ( pD->getFieldValue().getType() != pF->getFieldValue().getType()
)
+--- cego/src/CegoTableManager.cc.orig 2009-03-14 10:15:51 +0100
++++ cego/src/CegoTableManager.cc 2009-03-17 08:31:29 +0100
+@@ -2631,10 +2631,10 @@
+ if ( pD->getValue().getType() != pF->getValue().getType() )
{
throw Exception(EXLOC, Chain("Mismatched data type <")
-- +
CEGO_TYPE_MAP[(int)(pD->getFieldValue().getType())]
-+ +
CEGO_TYPE_MAP[(int)(pD->getFieldValue().getType())].c_str()
+- +
CEGO_TYPE_MAP[(int)(pD->getValue().getType())]
++ +
CEGO_TYPE_MAP[(int)(pD->getValue().getType())].c_str()
+ Chain("> for attribute ") + pF->getAttrName()
+ Chain(", expected type <")
-- +
CEGO_TYPE_MAP[(int)(pF->getFieldValue().getType())]
-+ +
CEGO_TYPE_MAP[(int)(pF->getFieldValue().getType())].c_str()
+- + CEGO_TYPE_MAP[(int)(pF->getValue().getType())]
++ +
CEGO_TYPE_MAP[(int)(pF->getValue().getType())].c_str()
+ Chain(">"));
}
-Index: cego/src/CegoFieldValue.cc
---- cego/src/CegoFieldValue.cc.orig 2008-09-30 09:46:44 +0200
-+++ cego/src/CegoFieldValue.cc 2008-11-25 21:22:25 +0100
-@@ -1555,12 +1555,12 @@
- case BIGINT_TYPE:
- case DECIMAL_TYPE:
- {
-- s = CEGO_TYPE_MAP[_type] + Chain("(") + Chain(_len) + Chain(")");
-+ s = CEGO_TYPE_MAP[_type].c_str() + Chain("(") + Chain(_len) +
Chain(")");
- break;
- }
- default:
- {
-- s = CEGO_TYPE_MAP[_type];
-+ s = CEGO_TYPE_MAP[_type].c_str();
- break;
- }
- }
-Index: cego/src/cgwtest.c
---- cego/src/cgwtest.c.orig 2009-02-08 16:20:59 +0100
-+++ cego/src/cgwtest.c 2009-03-01 20:59:51 +0100
-@@ -26,6 +26,8 @@
-
///////////////////////////////////////////////////////////////////////////////
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "cgwrap.h"
-
- void connect_test();
-Index: cego/src/Makefile.in
---- cego/src/Makefile.in.orig 2009-02-22 12:21:27 +0100
-+++ cego/src/Makefile.in 2009-03-01 21:14:22 +0100
-@@ -238,4 +238,4 @@
- CegoXMLHelper.o: CegoXMLHelper.cc CegoXMLHelper.h
- CegoTypeConverter.o: CegoTypeConverter.cc CegoTypeConverter.h
- CegoCaseCond.o: CegoCaseCond.cc CegoCaseCond.h
--cgwrap.o: cgwrap.c
-\ No newline at end of file
-+cgwrap.o: cgwrap.cc
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cego/cego.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 cego.spec
--- openpkg-src/cego/cego.spec 1 Mar 2009 20:25:53 -0000 1.37
+++ openpkg-src/cego/cego.spec 17 Mar 2009 15:34:23 -0000 1.38
@@ -24,9 +24,9 @@
# FIXME: rse: seems to have problems during building if old version is
still installed
# package version
-%define V_base 1.1.15
+%define V_base 1.1.16
%define V_xml 1.0.13
-%define V_cego 2.2.5
+%define V_cego 2.2.6
%define V_jdbc 1.2.9
# package information
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_cego}
-Release: 20090301
+Release: 20090317
# package options
%option with_jdbc no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
