rpms/hsqldb/F-12 hsqldb-1.8.0-autoincrement.patch, NONE, 1.1 hsqldb-1.8.0-bitxor-bitor.patch, NONE, 1.1 hsqldb.spec, 1.45, 1.46

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/hsqldb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22901

Modified Files:
	hsqldb.spec 
Added Files:
	hsqldb-1.8.0-autoincrement.patch 
	hsqldb-1.8.0-bitxor-bitor.patch 
Log Message:
* Thu Oct 22 2009 Jesse Keating <jkeating at redhat.com> - 1.8.0.10-4
- Add patches from Caolan for #523110 and #517839


hsqldb-1.8.0-autoincrement.patch:
 Table.java      |    4 ++--
 TableWorks.java |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE hsqldb-1.8.0-autoincrement.patch ---
--- misc/hsqldb/src/org/hsqldb/Table.java	2007-10-19 23:59:07.000000000 +0200
+++ misc/build/hsqldb/src/org/hsqldb/Table.java	2009-09-11 13:45:42.939231519 +0200
@@ -149,10 +149,10 @@
     Constraint[]      constraintList;                 // constrainst for the table
     HsqlArrayList[]   triggerLists;                   // array of trigger lists
     private int[]     colTypes;                       // fredt - types of columns
-    private int[]     colSizes;                       // fredt - copy of SIZE values for columns
+    int[]     	      colSizes;                       // fredt - copy of SIZE values for columns
     private int[]     colScales;                      // fredt - copy of SCALE values for columns
     private boolean[] colNullable;                    // fredt - modified copy of isNullable() values
-    private Expression[] colDefaults;                 // fredt - expressions of DEFAULT values
+    Expression[] 	  colDefaults;                 // fredt - expressions of DEFAULT values
     private int[]        defaultColumnMap;            // fred - holding 0,1,2,3,...
     private boolean      hasDefaultValues;            //fredt - shortcut for above
     boolean              sqlEnforceSize;              // inherited from the database -
--- misc/hsqldb/src/org/hsqldb/TableWorks.java	2007-01-14 06:48:16.000000000 +0100
+++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java	2009-09-11 13:47:50.328667463 +0200
@@ -670,7 +670,8 @@
             // default expressions can change
             oldCol.setType(newCol);
             oldCol.setDefaultExpression(newCol.getDefaultExpression());
-            table.setColumnTypeVars(colIndex);
+            table.colSizes[colIndex]    = oldCol.getSize();
+            table.colDefaults[colIndex] = oldCol.getDefaultExpression();
             table.resetDefaultsFlag();
 
             return;

hsqldb-1.8.0-bitxor-bitor.patch:
 Library.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hsqldb-1.8.0-bitxor-bitor.patch ---
# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- /home/hardydrew/ooo_source/OOO310_m15/hsqldb/download/hsqldb/Library.java
+++ /home/hardydrew/ooo_source/OOO310_m15/hsqldb/download/hsqldb/src/org/hsqldb/Library.java
@@ -1957,7 +1957,7 @@
         functionMap.put("bitand", bitand);
         functionMap.put("bitlength", bitLength);
         functionMap.put("bitor", bitor);
-        functionMap.put("bitxor", bitor);
+        functionMap.put("bitxor", bitxor);
         functionMap.put("character", character);
         functionMap.put("concat", concat);
         functionMap.put("cot", cot);


Index: hsqldb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hsqldb/F-12/hsqldb.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- hsqldb.spec	25 Jul 2009 02:13:39 -0000	1.45
+++ hsqldb.spec	22 Oct 2009 17:57:19 -0000	1.46
@@ -38,7 +38,7 @@
 
 Name:		hsqldb
 Version:	1.8.0.10
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD
@@ -52,6 +52,8 @@ Source4:    %{name}-1.8.0-standard-sqlto
 Patch0:     %{name}-1.8.0-scripts.patch
 Patch1:     hsqldb-tmp.patch
 Patch2:     %{name}-1.8.0-specify-su-shell.patch
+Patch3:     %{name}-1.8.0-bitxor-bitor.patch
+Patch4:     %{name}-1.8.0-autoincrement.patch
 Requires:   servletapi5
 Requires(post):   /bin/rm,/bin/ln
 Requires(post):   servletapi5
@@ -134,6 +136,8 @@ chmod -R go=u-w *
 %patch0
 %patch1 -p1
 %patch2
+%patch3 -p8
+%patch4 -p3
 
 %build
 export CLASSPATH=$(build-classpath \
@@ -270,6 +274,9 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Thu Oct 22 2009 Jesse Keating <jkeating at redhat.com> - 1.8.0.10-4
+- Add patches from Caolan for #523110 and #517839
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild