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: 10-Apr-2009 22:58:26
Branch: HEAD Handle: 2009041021582600
Modified files:
openpkg-src/cego cego.patch cego.spec
Log:
upgrading package: cego 2.2.7 -> 2.3.0
Summary:
Revision Changes Path
1.15 +0 -175 openpkg-src/cego/cego.patch
1.40 +2 -2 openpkg-src/cego/cego.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cego/cego.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 cego.patch
--- openpkg-src/cego/cego.patch 24 Mar 2009 19:02:30 -0000 1.14
+++ openpkg-src/cego/cego.patch 10 Apr 2009 20:58:26 -0000 1.15
@@ -1,102 +1,3 @@
-Index: cego/src/CegoAction.cc
---- cego/src/CegoAction.cc.orig 2009-03-23 10:06:24 +0100
-+++ cego/src/CegoAction.cc 2009-03-24 19:32:38 +0100
-@@ -2489,9 +2489,9 @@
-
- if ( _defaultValue.castTo(_dataType) == false )
- throw Exception(EXLOC, Chain("Cannot cast from <")
-- + CEGO_TYPE_MAP[_defaultValue.getType()]
-+ + CEGO_TYPE_MAP[_defaultValue.getType()].c_str()
- + Chain("> to <")
-- + CEGO_TYPE_MAP[_dataType]
-+ + CEGO_TYPE_MAP[_dataType].c_str()
- + Chain(">"));
-
- _fieldList.Insert(CegoField(Chain(), Chain(), _fieldName, _dataType,
_dataLen, _defaultValue, _isNullable));
-@@ -2502,9 +2502,9 @@
- {
- if ( _defaultValue.castTo(_dataType) == false )
- throw Exception(EXLOC, Chain("Cannot cast from <")
-- + CEGO_TYPE_MAP[_defaultValue.getType()]
-+ + CEGO_TYPE_MAP[_defaultValue.getType()].c_str()
- + Chain("> to <")
-- + CEGO_TYPE_MAP[_dataType]
-+ + CEGO_TYPE_MAP[_dataType].c_str()
- + Chain(">"));
-
- _fieldList.Insert(CegoField(Chain(), Chain(), _fieldName, _dataType,
_dataLen, _defaultValue, _isNullable));
-Index: cego/src/CegoContentObject.cc
---- cego/src/CegoContentObject.cc.orig 2009-03-23 09:57:01 +0100
-+++ cego/src/CegoContentObject.cc 2009-03-24 19:32:38 +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->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 2009-03-23 10:07:03 +0100
-+++ cego/src/CegoDataType.h 2009-03-24 19:32:38 +0100
-@@ -55,7 +55,7 @@
-
- // this must be correlated to the enum above
-
--static char *CEGO_TYPE_MAP[] =
-+static const string CEGO_TYPE_MAP[] =
- {
- "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-24 19:32:38 +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-21 19:18:44 +0100
-+++ cego/src/CegoFieldValue.cc 2009-03-24 19:32:38 +0100
-@@ -1607,12 +1607,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 2009-03-16 23:34:29 +0100
-+++ cego/src/CegoJDBCInfo.cc 2009-03-24 19:32:38 +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->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 2009-03-21 17:39:03 +0100
+++ cego/src/CegoOutput.cc 2009-03-24 19:32:38 +0100
@@ -108,79 +9,3 @@
#include "CegoOutput.h"
#include "CegoDefs.h"
-Index: cego/src/CegoProcedure.cc
---- cego/src/CegoProcedure.cc.orig 2009-03-01 12:58:53 +0100
-+++ cego/src/CegoProcedure.cc 2009-03-24 19:32:38 +0100
-@@ -112,10 +112,10 @@
- if ( fv.castTo(pVar->getValue().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)pVar->getValue().getType()] + " )");
-+ +
CEGO_TYPE_MAP[(int)pVar->getValue().getType()].c_str() + " )");
- }
- }
-
-Index: cego/src/CegoQueryHelper.cc
---- cego/src/CegoQueryHelper.cc.orig 2009-03-14 14:40:48 +0100
-+++ cego/src/CegoQueryHelper.cc 2009-03-24 19:32:38 +0100
-@@ -672,7 +672,7 @@
- }
- default:
- {
-- Chain msg = Chain("Aggregation not supported on datatype <") +
CEGO_TYPE_MAP[ (int) fv.getType()] + Chain(">");
-+ Chain msg = Chain("Aggregation not supported on datatype <") +
CEGO_TYPE_MAP[ (int) fv.getType()].c_str() + Chain(">");
- throw Exception(EXLOC, msg);
- break;
- }
-@@ -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->getType()] + " )");
-+ + CEGO_TYPE_MAP[(int)pFV->getType()].c_str() + "
)");
- }
- }
-
-Index: cego/src/CegoTableManager.cc
---- cego/src/CegoTableManager.cc.orig 2009-03-23 09:54:42 +0100
-+++ cego/src/CegoTableManager.cc 2009-03-24 19:32:38 +0100
-@@ -2653,10 +2653,10 @@
- if ( pD->getValue().getType() != pF->getValue().getType() )
- {
- throw Exception(EXLOC, Chain("Mismatched data type <")
-- +
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->getValue().getType())]
-+ +
CEGO_TYPE_MAP[(int)(pF->getValue().getType())].c_str()
- + Chain(">"));
-
- }
-Index: cego/src/Makefile.in
---- cego/src/Makefile.in.orig 2009-03-21 18:38:09 +0100
-+++ cego/src/Makefile.in 2009-03-24 19:52:23 +0100
-@@ -207,7 +207,7 @@
-
- libcego.a: $(LIBOBJECTS)
- $(AR) -r libcego.a $(LIBOBJECTS)
-- $(RANLIB) libCego.a
-+ $(RANLIB) libcego.a
-
- libcgwrap.a: $(CGWRAPOBJECTS)
- $(AR) -r libcgwrap.a $(CGWRAPOBJECTS)
-@@ -328,4 +328,4 @@
- CegoXMLHelper.o: CegoXMLHelper.cc CegoXMLHelper.h
- CegoXMLSpace.o: CegoXMLSpace.cc CegoXMLSpace.h
- CegoXPorter.o: CegoXPorter.cc CegoXPorter.h
--cgwrap.o: cgwrap.cc
-\ No newline at end of file
-+cgwrap.o: cgwrap.cc
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cego/cego.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 cego.spec
--- openpkg-src/cego/cego.spec 24 Mar 2009 19:02:30 -0000 1.39
+++ openpkg-src/cego/cego.spec 10 Apr 2009 20:58:26 -0000 1.40
@@ -26,7 +26,7 @@
# package version
%define V_base 1.1.16
%define V_xml 1.0.13
-%define V_cego 2.2.7
+%define V_cego 2.3.0
%define V_jdbc 1.2.12
# package information
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_cego}
-Release: 20090324
+Release: 20090410
# package options
%option with_jdbc no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
