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: 14-Jun-2006 21:24:42
Branch: HEAD Handle: 2006061420244000
Modified files:
openpkg-src/myodbc myodbc.patch myodbc.spec
Log:
upgrading package: myodbc 3.51.11 -> 3.51.12
Summary:
Revision Changes Path
1.3 +66 -33 openpkg-src/myodbc/myodbc.patch
1.44 +11 -9 openpkg-src/myodbc/myodbc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/myodbc/myodbc.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 myodbc.patch
--- openpkg-src/myodbc/myodbc.patch 10 Feb 2005 15:27:01 -0000 1.2
+++ openpkg-src/myodbc/myodbc.patch 14 Jun 2006 19:24:40 -0000 1.3
@@ -1,26 +1,59 @@
+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: util/Makefile.in
---- util/Makefile.in.orig 2005-02-02 17:56:15 +0100
-+++ util/Makefile.in 2005-02-10 16:11:33 +0100
-@@ -60,7 +60,7 @@
- MYODBCUtilReadConnectStr.lo MYODBCUtilReadDataSource.lo \
- MYODBCUtilReadDataSourceStr.lo MYODBCUtilReadDriver.lo \
- MYODBCUtilWriteConnectStr.lo MYODBCUtilWriteDataSource.lo \
-- MYODBCUtilWriteDataSourceStr.lo MYODBCUtilWriteDriver.lo
-+ MYODBCUtilWriteDataSourceStr.lo MYODBCUtilWriteDriver.lo strndup.lo
+--- util/Makefile.in.orig 2005-10-10 03:05:47 +0200
++++ util/Makefile.in 2006-06-14 09:27:34 +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)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/driver
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -83,7 +83,8 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/MYODBCUtilWriteConnectStr.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/MYODBCUtilWriteDataSource.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/MYODBCUtilWriteDataSourceStr.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/MYODBCUtilWriteDriver.Plo
[EMAIL PROTECTED]@ ./$(DEPDIR)/MYODBCUtilWriteDriver.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/strndup.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
-@@ -258,7 +259,8 @@
+@@ -247,7 +247,8 @@
MYODBCUtilWriteConnectStr.c \
MYODBCUtilWriteDataSource.c \
MYODBCUtilWriteDataSourceStr.c \
@@ -30,7 +63,7 @@
EXTRA_DIST = \
util.pro \
-@@ -334,6 +336,7 @@
+@@ -324,6 +325,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]@
@@ -39,8 +72,8 @@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
Index: util/strndup.c
---- /dev/null 2005-02-10 16:13:23 +0100
-+++ util/strndup.c 2005-02-10 16:17:25 +0100
+--- /dev/null 2006-06-14 09:33:01 +0200
++++ util/strndup.c 2006-06-14 09:27:34 +0200
@@ -0,0 +1,15 @@
+
+#include <stdio.h>
@@ -57,15 +90,15 @@
+ return dst;
+}
+
-Index: samples/Makefile.in
---- samples/Makefile.in.orig 2005-02-02 17:56:15 +0100
-+++ samples/Makefile.in 2005-02-10 16:21:58 +0100
-@@ -252,7 +252,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 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.43 -r1.44 myodbc.spec
--- openpkg-src/myodbc/myodbc.spec 1 Jan 2006 13:17:05 -0000 1.43
+++ openpkg-src/myodbc/myodbc.spec 14 Jun 2006 19:24:40 -0000 1.44
@@ -24,12 +24,12 @@
# package version
%define V_major 3.51
-%define V_minor 11
+%define V_minor 12
# package information
Name: myodbc
Summary: MySQL Interface to UnixODBC
-URL: http://www.mysql.com/downloads/api-myodbc.html
+URL: http://dev.mysql.com/downloads/connector/odbc/
Vendor: MySQL AB
Packager: OpenPKG
Distribution: OpenPKG
@@ -37,10 +37,10 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20050210
+Release: 20060614
# list of sources
-Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MyODBC3/MyODBC-%{version}.tar.gz
+Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MyODBC3/mysql-connector-odbc-%{version}.tar.gz
Patch0: myodbc.patch
# build information
@@ -48,8 +48,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: mysql, unixodbc
-PreReq: mysql, unixodbc
+BuildPreReq: mysql, ODBC
+PreReq: mysql, ODBC
AutoReq: no
AutoReqProv: no
@@ -59,12 +59,12 @@
%track
prog myodbc = {
version = %{version}
- url = http://www.mysql.com/downloads/api-myodbc-3.51.html
- regex = MyODBC-(__VER__)\.tar\.gz
+ url = http://dev.mysql.com/downloads/connector/odbc/
+ regex = mysql-connector-odbc-(__VER__)\.tar\.gz
}
%prep
- %setup -q -n MyODBC-%{V_major}.%{V_minor}
+ %setup -q -n mysql-connector-odbc-%{V_major}.%{V_minor}
%patch -p0
%build
@@ -80,6 +80,8 @@
--with-unixODBC-libs=%{l_prefix}/lib \
--with-unixODBC-includes=%{l_prefix}/include \
--disable-thread-safe \
+ --disable-gui \
+ --without-x \
--enable-shared \
--disable-static
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
