rpms/unixODBC/F-12 enable-items.patch, NONE, 1.1 conffile.h, 1.2, 1.3 unixODBC.spec, 1.51, 1.52
Tom Lane
tgl at fedoraproject.org
Sun Dec 20 00:00:48 UTC 2009
Author: tgl
Update of /cvs/pkgs/rpms/unixODBC/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29300
Modified Files:
conffile.h 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: conffile.h
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/F-12/conffile.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- conffile.h 6 Jun 2009 19:35:44 -0000 1.2
+++ conffile.h 20 Dec 2009 00:00:47 -0000 1.3
@@ -4,13 +4,14 @@
* identical. Hence, this file is architecture-independent and calls
* in an arch-dependent file that will appear in just one RPM.
*
+ * To avoid breaking arches not explicitly supported by Red Hat, we
+ * use this indirection file *only* on known multilib arches.
+ *
* Note: this may well fail if user tries to use gcc's -I- option.
* But that option is deprecated anyway.
*/
#if defined(__x86_64__)
#include "CONFFILE_x86_64.h"
-#elif defined(__ia64__)
-#include "CONFFILE_ia64.h"
#elif defined(__i386__)
#include "CONFFILE_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)
Index: unixODBC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/F-12/unixODBC.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- unixODBC.spec 21 Aug 2009 20:31:26 -0000 1.51
+++ unixODBC.spec 20 Dec 2009 00:00:48 -0000 1.52
@@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux
Name: unixODBC
Version: 2.2.14
-Release: 6%{?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
@@ -111,7 +113,7 @@ desktop-file-install --dir=$RPM_BUILD_RO
# multilib header hacks
# we only apply this to known Red Hat multilib arches, per bug #181335
case `uname -i` in
- i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 )
+ i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h
rm -f unixodbc_conf.h
sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h
@@ -183,6 +185,12 @@ 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
+- Clean up bogosity in multilib stub header support: ia64 should not be
+ listed (it's not multilib), sparcv9 isn't a possible uname -i output
+
* Fri Aug 21 2009 Tom Lane <tgl at redhat.com> 2.2.14-6
- Switch to building against qt4, not qt3. This means the DataManager,
DataManagerII, and odbctest applications are gone.
More information about the scm-commits
mailing list