rpms/unixODBC/devel unixODBC-2.2.11-symbols.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 installedltdl.patch, 1.2, 1.3 sources, 1.11, 1.12 unixODBC.spec, 1.24, 1.25
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 8 20:02:00 UTC 2005
Update of /cvs/dist/rpms/unixODBC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23804
Modified Files:
.cvsignore installedltdl.patch sources unixODBC.spec
Added Files:
unixODBC-2.2.11-symbols.patch
Log Message:
Update to unixODBC 2.2.11.
unixODBC-2.2.11-symbols.patch:
Makefile.am | 3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE unixODBC-2.2.11-symbols.patch ---
The odbcinst.exp file shipped with 2.2.11 is a few symbols shy of a load.
We could try adding symbols to it, but the safest and most backward-compatible
solution is to not use it. Hopefully the community will have this sorted
properly by 2.2.12, and we can get rid of this kluge.
diff -Naur unixODBC-2.2.11.orig/odbcinst/Makefile.am unixODBC-2.2.11/odbcinst/Makefile.am
--- unixODBC-2.2.11.orig/odbcinst/Makefile.am 2005-02-07 05:14:01.000000000 -0500
+++ unixODBC-2.2.11/odbcinst/Makefile.am 2005-04-08 13:48:45.719529522 -0400
@@ -11,8 +11,7 @@
libodbcinst_la_LDFLAGS = \
-version-info @LIB_VERSION@ \
- -export-dynamic \
- -export-symbols @srcdir@/odbcinst.exp
+ -export-dynamic
libodbcinst_la_LIBADD = \
../ini/libinilc.la \
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 28 Oct 2004 22:43:18 -0000 1.11
+++ .cvsignore 8 Apr 2005 20:01:57 -0000 1.12
@@ -1 +1 @@
-unixODBC-2.2.10.tar.gz
+unixODBC-2.2.11.tar.gz
installedltdl.patch:
configure.in | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
Index: installedltdl.patch
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/installedltdl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- installedltdl.patch 23 Sep 2004 03:46:26 -0000 1.2
+++ installedltdl.patch 8 Apr 2005 20:01:57 -0000 1.3
@@ -1,38 +1,26 @@
-diff -c -r unixODBC-2.2.9/configure.in unixODBC-2.2.9-installedltdl/configure.in
-*** unixODBC-2.2.9/configure.in Mon Jun 7 07:30:21 2004
---- unixODBC-2.2.9-installedltdl/configure.in Wed Sep 22 19:55:42 2004
-***************
-*** 126,145 ****
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-rltdgroup) ;;
- esac],[ltdllib=false])
-
-! dnl Enable building of the convenience library
-! dnl and set LIBLTDL accordingly
-
- INCLTDL=""
- LIBLTDL=""
-
-! AC_MSG_CHECKING( Have we enabled using RTDL_GROUP )
-! if test "x$rtldgroup" = "xtrue"; then
-! AC_MSG_RESULT( yes )
-! AC_LIBLTDL_CONVENIENCE
-! else
-! AC_MSG_RESULT( no );
-! AC_LIBLTDL_CONVENIENCE_G
-! fi
-
- dnl Check for dlopen support
- AC_LIBTOOL_DLOPEN
---- 126,137 ----
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-rltdgroup) ;;
- esac],[ltdllib=false])
-
-! dnl Use the installed libltdl
-
- INCLTDL=""
- LIBLTDL=""
-
-! AC_LIBLTDL_INSTALLABLE
-
- dnl Check for dlopen support
- AC_LIBTOOL_DLOPEN
+diff -Naur unixODBC-2.2.11.orig/configure.in unixODBC-2.2.11/configure.in
+--- unixODBC-2.2.11.orig/configure.in 2005-01-17 05:42:01.000000000 -0500
++++ unixODBC-2.2.11/configure.in 2005-04-07 21:10:19.596739700 -0400
+@@ -134,20 +134,12 @@
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-ltdllib) ;;
+ esac],[ltdllib=false])
+
+-dnl Enable building of the convenience library
+-dnl and set LIBLTDL accordingly
++dnl Use the installed libltdl
+
+ INCLTDL=""
+ LIBLTDL=""
+
+-AC_MSG_CHECKING( Have we enabled using RTLD_GROUP )
+-if test "x$rtldgroup" = "xtrue"; then
+-AC_MSG_RESULT( yes )
+-AC_LIBLTDL_CONVENIENCE
+-else
+-AC_MSG_RESULT( no );
+-AC_LIBLTDL_CONVENIENCE_G
+-fi
++AC_LIBLTDL_INSTALLABLE
+
+ dnl Check for dlopen support
+ AC_LIBTOOL_DLOPEN
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 28 Oct 2004 22:43:18 -0000 1.11
+++ sources 8 Apr 2005 20:01:57 -0000 1.12
@@ -1 +1 @@
-a2e9d440c70e12c22d2548aa452c43ef unixODBC-2.2.10.tar.gz
+9ae806396844e38244cf65ad26ba0f23 unixODBC-2.2.11.tar.gz
Index: unixODBC.spec
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- unixODBC.spec 7 Mar 2005 06:34:40 -0000 1.24
+++ unixODBC.spec 8 Apr 2005 20:01:57 -0000 1.25
@@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux.
Name: unixODBC
-Version: 2.2.10
-Release: 3
+Version: 2.2.11
+Release: 1
License: LGPL
Group: System Environment/Libraries
Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
Source3: DataManager.desktop
Patch1: depcomp.patch
Patch2: installedltdl.patch
+Patch3: unixODBC-2.2.11-symbols.patch
URL: http://www.unixODBC.org/
Conflicts: iodbc
BuildPrereq: kdelibs-devel qt-devel libmng-devel XFree86-devel automake autoconf libtool
@@ -46,6 +47,7 @@
%setup -q
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# 2.2.8 includes a libtool that is too old for some of our architectures.
# Blow it away and replace with build system's libtool. (We intend to use
@@ -156,6 +158,9 @@
%postun -p /sbin/ldconfig
%changelog
+* Fri Apr 8 2005 Tom Lane <tgl at redhat.com> 2.2.11-1
+- Update to unixODBC 2.2.11
+
* Mon Mar 7 2005 Tom Lane <tgl at redhat.com> 2.2.10-3
- Rebuild with gcc4.
More information about the fedora-cvs-commits
mailing list