OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-May-2007 09:38:00
Branch: HEAD Handle: 2007050808375900
Modified files:
openpkg-src/myodbc myodbc.patch myodbc.spec
Log:
upgrading package: myodbc 3.51.12 -> 3.51.15r409
Summary:
Revision Changes Path
1.4 +20 -63 openpkg-src/myodbc/myodbc.patch
1.48 +2 -2 openpkg-src/myodbc/myodbc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/myodbc/myodbc.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 myodbc.patch
--- openpkg-src/myodbc/myodbc.patch 14 Jun 2006 19:24:40 -0000 1.3
+++ openpkg-src/myodbc/myodbc.patch 8 May 2007 07:37:59 -0000 1.4
@@ -1,59 +1,28 @@
-Index: driver/results.c
---- driver/results.c.orig 2005-10-09 21:33:40 +0200
-+++ driver/results.c 2006-06-14 09:31:28 +0200
-@@ -543,6 +543,7 @@
- @purpose : rerunrs column atribute values
- */
-
-+#if 0
- #if defined(__APPLE__)
- SQLRETURN SQL_API SQLColAttribute( SQLHSTMT StatementHandle,
- SQLUSMALLINT ColumnNumber,
-@@ -569,6 +570,7 @@
- StringLengthPtr,
- NumericAttributePtr );
- }
-+#endif
-
-
- /*
-Index: myodbcinst/Makefile.in
---- myodbcinst/Makefile.in.orig 2005-10-10 03:05:45 +0200
-+++ myodbcinst/Makefile.in 2006-06-14 09:35:17 +0200
-@@ -237,7 +237,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- @[EMAIL PROTECTED] = myodbcinst.c
[EMAIL PROTECTED]@myodbc3i_LDADD = @LIBS@ ../util/libmyodbcutil.la
[EMAIL PROTECTED]@myodbc3i_LDADD = ../util/libmyodbcutil.la @ODBC_DM_LIB@
@LIBS@
- @[EMAIL PROTECTED] = ../util/libmyodbcutil.la
-
- # [EMAIL PROTECTED]@
-Index: samples/Makefile.in
---- samples/Makefile.in.orig 2005-10-10 03:05:46 +0200
-+++ samples/Makefile.in 2006-06-14 09:27:34 +0200
-@@ -254,7 +254,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- INCLUDES = -I..
--AM_LDFLAGS = ../driver_r/libmyodbc3_r.la @MYSQL_THREADSAFE_LIB@
-+AM_LDFLAGS = ../driver/libmyodbc3.la @MYSQL_THREADSAFE_LIB@
- EXTRA_DIST = my_utility.h run-samples WIN-Makefile
- all: all-am
-
+Index: configure
+--- configure.orig 2007-05-04 04:55:25 +0200
++++ configure 2007-05-08 09:33:10 +0200
+@@ -20846,7 +20846,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lodbcinst $LIBS"
++LIBS="-lodbcinst -lodbc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
Index: util/Makefile.in
---- util/Makefile.in.orig 2005-10-10 03:05:47 +0200
-+++ util/Makefile.in 2006-06-14 09:27:34 +0200
+--- util/Makefile.in.orig 2007-05-04 04:55:23 +0200
++++ util/Makefile.in 2007-05-08 09:33:59 +0200
@@ -59,7 +59,7 @@
MYODBCUtilReadDataSource.lo MYODBCUtilReadDataSourceStr.lo \
MYODBCUtilReadDriver.lo MYODBCUtilWriteConnectStr.lo \
MYODBCUtilWriteDataSource.lo MYODBCUtilWriteDataSourceStr.lo \
- MYODBCUtilWriteDriver.lo
+ MYODBCUtilWriteDriver.lo strndup.lo
- libmyodbcutil_la_OBJECTS = $(am_libmyodbcutil_la_OBJECTS)
+ libmyodbc3u_la_OBJECTS = $(am_libmyodbc3u_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/driver
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -247,7 +247,8 @@
+@@ -253,7 +253,8 @@
MYODBCUtilWriteConnectStr.c \
MYODBCUtilWriteDataSource.c \
MYODBCUtilWriteDataSourceStr.c \
@@ -62,8 +31,8 @@
+ strndup.c
EXTRA_DIST = \
- util.pro \
-@@ -324,6 +325,7 @@
+ util.pro
+@@ -329,6 +330,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -72,8 +41,8 @@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
Index: util/strndup.c
---- /dev/null 2006-06-14 09:33:01 +0200
-+++ util/strndup.c 2006-06-14 09:27:34 +0200
+--- /dev/null 2007-05-08 09:33:33 +0200
++++ util/strndup.c 2007-05-08 09:28:45 +0200
@@ -0,0 +1,15 @@
+
+#include <stdio.h>
@@ -90,15 +59,3 @@
+ return dst;
+}
+
-Index: configure
---- configure.orig 2005-10-10 03:02:59 +0200
-+++ configure 2006-06-14 21:14:40 +0200
-@@ -24491,7 +24491,7 @@
- #define HAVE_SQLGETPRIVATEPROFILESTRING 1
- _ACEOF
-
-- LIBS="$LIBS -lodbcinst"
-+ LIBS="$LIBS -lodbcinst -lodbc"
- have_odbcinst=yes
- else
- LIBS="$save_LIBS"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/myodbc/myodbc.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 myodbc.spec
--- openpkg-src/myodbc/myodbc.spec 1 Jan 2007 17:39:59 -0000 1.47
+++ openpkg-src/myodbc/myodbc.spec 8 May 2007 07:37:59 -0000 1.48
@@ -24,7 +24,7 @@
# package version
%define V_major 3.51
-%define V_minor 12
+%define V_minor 15r409
# package information
Name: myodbc
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20061218
+Release: 20070508
# list of sources
Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MyODBC3/mysql-connector-odbc-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
