rpms/unixODBC/devel enable-items.patch, NONE, 1.1 unixODBC.spec, 1.53, 1.54

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/unixODBC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26938

Modified Files:
	unixODBC.spec 
Added Files:
	enable-items.patch 
Log Message:
Fix bug preventing drivers from being selected in ODBCConfig

enable-items.patch:
 CDataSourceNameList.cpp |    6 +++---
 CDriverList.cpp         |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE enable-items.patch ---
Allow drivers to be selected in ODBCConfig, per bug 544852.


diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp	2008-09-04 10:55:54.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp	2009-12-19 18:31:39.000000000 -0500
@@ -346,15 +346,15 @@
             setRowCount( nElement + 1 );
 
             ptablewidgetitem = new QTableWidgetItem( szSectionName );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nElement, 0, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDescription );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nElement, 1, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDriver );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nElement, 2, ptablewidgetitem );
 		}
 		SQLSetConfigMode( ODBC_BOTH_DSN );
diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp	2008-09-04 11:57:53.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp	2009-12-19 18:31:29.000000000 -0500
@@ -852,19 +852,19 @@
             setRowCount( nRow + 1 );
 
             ptablewidgetitem = new QTableWidgetItem( szDriverName );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 0, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDescription );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 1, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szDriver );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 2, ptablewidgetitem );
 
             ptablewidgetitem = new QTableWidgetItem( szSetup );
-            ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+            ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
             setItem( nRow, 3, ptablewidgetitem );
 
             nRow++;


Index: unixODBC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- unixODBC.spec	25 Nov 2009 01:23:37 -0000	1.53
+++ unixODBC.spec	19 Dec 2009 23:49:26 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.2.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -20,6 +20,7 @@ Patch7: libtool-config.patch
 Patch8: so-version-bump.patch
 Patch9: keep-typedefs.patch
 Patch10: odbcint64-config.patch
+Patch11: enable-items.patch
 
 Conflicts: iodbc
 BuildRequires: libX11-devel libXt-devel libXext-devel
@@ -62,6 +63,7 @@ This package contains components for the
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 chmod 0644 Drivers/MiniSQL/*.c
 chmod 0644 Drivers/nn/*.c
@@ -183,6 +185,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Dec 19 2009 Tom Lane <tgl at redhat.com> 2.2.14-9
+- Fix bug preventing drivers from being selected in ODBCConfig
+Resolves: #544852
+
 * Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.14-8
 - Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)