Djam/mysql-connector-odbc
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/mysql-connector-odbc.git synced 2025-02-23 13:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 5.1.8

Browse source
This commit is contained in:
Rosa 2012-02-01 20:52:32 +04:00
commit a7c88dc229
6 changed files with 424 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml Normal file
View file

@ -0,0 +1,2 @@
sources:
"mysql-connector-odbc-5.1.8.tar.gz": 2272075c66712cf7a05e50eeb4520f7c504c3ae8

103
dsn-editor.pro Normal file
View file

@ -0,0 +1,103 @@
# #########################################################
#
# \brief This is a qmake project file for building the
# the Qt based GUI MYODBCConfig application.
#
# The build here is done by using the setup code
# directly - at build-time.
#
# #########################################################
# #########################################################
# COMMON
# #########################################################
TEMPLATE = app
TARGET = myodbc3c
DESTDIR = ../bin
include( ../common.pri )
include( ../config.pri )
CONFIG += qt
include( ../defines.pri )
include( ../odbc.pri )
INCLUDEPATH += ../util ../setup
# #########################################################
# WIN32
# #########################################################
win32 {
LIBS += user32.lib ..\util\myodbc3u.lib
# RC_FILE += MYODBCConfig.rc
}
# #########################################################
# UNIX
# #########################################################
mac {
} else:unix {
# INCLUDEPATH += ../util ../setup /usr/include
LIBS += -L../util -lmyodbc3u -L../setup -lmyodbc3S
}
# #########################################################
# OSX
# On OSX we produce a directory called; MYODBCConfig.app
# which contains everything needed to execute the app
# using the 'open' command or by double-clicking in
# Finder. MYODBCConfig.app can be copied to where desired
# in the file system (for example; /Applications/Utilities).
# #########################################################
mac {
# DEFINES -= HAVE_ODBCINST_H
# DEFINES += HAVE_IODBCINST_H
LIBS -= -lmyodbc3S
LIBS += -L../util -lmyodbc3u
LIBS += -lltdl -framework Carbon -framework QuickTime -lz -framework OpenGL -framework AGL -lz
RC_FILE = MYODBCConfig.icns
}
# #########################################################
# FILES
# #########################################################
HEADERS += \
../util/MYODBCUtil.h \
../setup/MYODBCSetup.h \
../setup/MYODBCSetupAssistText.h \
../setup/MYODBCSetupCheckBox.h \
../setup/MYODBCSetupComboBox.h \
../setup/MYODBCSetupComboBoxDatabases.h \
../setup/MYODBCSetupDataSourceDialog.h \
../setup/MYODBCSetupDataSourceTab1.h \
../setup/MYODBCSetupDataSourceTab2.h \
../setup/MYODBCSetupDataSourceTab3.h \
../setup/MYODBCSetupDataSourceTab3a.h \
../setup/MYODBCSetupDataSourceTab3b.h \
../setup/MYODBCSetupDataSourceTab3c.h \
../setup/MYODBCSetupDataSourceTab3d.h \
../setup/MYODBCSetupLineEdit.h
SOURCES += \
main.cpp \
../setup/MYODBCSetupAssistText.cpp \
../setup/MYODBCSetupCheckBox.cpp \
../setup/MYODBCSetupComboBox.cpp \
../setup/MYODBCSetupComboBoxDatabases.cpp \
../setup/MYODBCSetupConfigDSNAdd.c \
../setup/MYODBCSetupConfigDSNEdit.c \
../setup/MYODBCSetupConfigDSNRemove.c \
../setup/MYODBCSetupDataSourceConfig.cpp \
../setup/MYODBCSetupDataSourceDialog.cpp \
../setup/MYODBCSetupDataSourceTab1.cpp \
../setup/MYODBCSetupDataSourceTab2.cpp \
../setup/MYODBCSetupDataSourceTab3.cpp \
../setup/MYODBCSetupDataSourceTab3a.cpp \
../setup/MYODBCSetupDataSourceTab3b.cpp \
../setup/MYODBCSetupDataSourceTab3c.cpp \
../setup/MYODBCSetupDataSourceTab3d.cpp \
../setup/MYODBCSetupDriverConnect.c \
../setup/MYODBCSetupDriverConnectPrompt.cpp \
../setup/MYODBCSetupHandleInstallerError.c \
../setup/MYODBCSetupLineEdit.cpp

16
myodbc-shutdown.patch Normal file
View file

@ -0,0 +1,16 @@
myodbc_end really should only be invoked during Windows DLL unload, since it's
not connection-specific and not thread-safe either. This bit of brain fade
accounts for our bug #185343 and several bugs filed at mysql.com.
diff -Naur mysql-connector-odbc-3.51.14r248.orig/driver/handle.c mysql-connector-odbc-3.51.14r248/driver/handle.c
--- mysql-connector-odbc-3.51.14r248.orig/driver/handle.c 2007-03-07 18:56:40.000000000 -0500
+++ mysql-connector-odbc-3.51.14r248/driver/handle.c 2007-04-20 13:12:25.000000000 -0400
@@ -121,7 +121,6 @@
GlobalFree(GlobalHandle((HGLOBAL) henv));
#else
if (henv) my_free((char*) henv,MYF(0));
- myodbc_end();
#endif /* _UNIX_ */
return(SQL_SUCCESS);
}

22
mysql-connector-odbc-5.1.5-fix-str-fmt.patch Normal file
View file

@ -0,0 +1,22 @@
--- dltest/dltest.c.str 2009-01-28 18:33:11.000000000 +0100
+++ dltest/dltest.c 2009-01-28 18:33:45.000000000 +0100
@@ -62,7 +62,7 @@
if ( argc < 2 )
{
- printf( szSyntax );
+ printf( "%s",szSyntax );
exit( 1 );
}
--- installer/myodbc3i.c.str 2009-01-28 18:30:40.000000000 +0100
+++ installer/myodbc3i.c 2009-01-28 18:30:54.000000000 +0100
@@ -144,7 +144,7 @@
void main_usage()
{
- fprintf(stderr, usage);
+ fprintf(stderr, "%s",usage);
}

11
mysql-connector-odbc-no_windoze.diff Normal file
View file

@ -0,0 +1,11 @@
--- MYODBC_ODBC.h 2008-07-19 17:15:17.000000000 +0200
+++ MYODBC_ODBC.h.oden 2008-07-19 17:17:44.000000000 +0200
@@ -25,7 +25,7 @@
# define SQL_API
# endif
#else
-# include <windows.h>
+/* # include <windows.h> */
# ifndef RC_INVOKED
# pragma pack(1)
# endif

270
mysql-connector-odbc.spec Normal file
View file

@ -0,0 +1,270 @@
Summary: ODBC driver for MySQL
Name: mysql-connector-odbc
Version: 5.1.8
Release: %mkrel 1
# exceptions allow library to be linked with most open source SW,
# not only GPL code.
License: GPLv2 with exceptions
Group: System/Libraries
URL: http://www.mysql.com/products/connector/
Source0: http://mir2.ovh.net/ftp.mysql.com/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-%{version}.tar.gz
Source1: dsn-editor.pro
Patch1: myodbc-shutdown.patch
Patch3: mysql-connector-odbc-no_windoze.diff
Patch5: mysql-connector-odbc-5.1.5-fix-str-fmt.patch
Requires: unixODBC
BuildRequires: mysql-devel
BuildRequires: unixODBC-devel
BuildRequires: openssl-devel
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libltdl-devel
BuildRequires: libtool
BuildRequires: qt4-devel
Obsoletes: MyODBC < %version-%release
Provides: MyODBC = %version-%release
Obsoletes: %{mklibname myodbc 1} < %version
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%description
The MySQL Connector/ODBC is the name for the family of MySQL ODBC drivers
(previously called MyODBC drivers) that provide access to a MySQL database
using the industry standard Open Database Connectivity (ODBC) API.
MySQL Connector/ODBC provides both driver-manager based and native
interfaces to the MySQL database, which full support for MySQL functionality,
including stored procedures, transactions and, with Connector/ODBC 5.1,
full Unicode compliance.
%package devel
Summary: Development library for ODBC driver for MySQL
Group: Development/C
Provides: lib%{name}-devel %{name}-devel libmyodbc-devel
Obsoletes: lib%{name}-devel %{name}-devel libmyodbc-devel
Requires: %{name} = %{version}
Obsoletes: %{mklibname -d myodbc 1} < %version
Obsoletes: %{mklibname -d mydobc} < %version
%description devel
The MySQL Connector/ODBC is the name for the family of MySQL ODBC drivers
(previously called MyODBC drivers) that provide access to a MySQL database
using the industry standard Open Database Connectivity (ODBC) API.
MySQL Connector/ODBC provides both driver-manager based and native
interfaces to the MySQL database, which full support for MySQL functionality,
including stored procedures, transactions and, with Connector/ODBC 5.1,
full Unicode compliance.
%prep
%setup -q -n mysql-connector-odbc-%{version}
%patch1 -p1
%patch3 -p0
%patch5 -p0
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CPPFLAGS="-I%{qt4include}/Qt"
%configure2_5x \
--enable-shared \
--enable-static \
--enable-gui \
--with-qt-dir=%{qt4dir} \
--with-qt-includes=%{qt4include} \
--with-qt-libraries=%{qt4lib} \
--enable-dmlink \
--enable-myodbc-installer \
--enable-odbcinstlink \
--with-odbc-ini=%{_sysconfdir}/odbc.ini
%make
%install
rm -rf %{buildroot}
%makeinstall_std
%if 0
# setup links for consolehelpper support to allow root System DSN config
install -d %{buildroot}%{_sbindir}
pushd %{buildroot}%{_bindir}
ln -sf myodbc-installer MyODBC
ln -sf consolehelper MyODBC-root
cd %{buildroot}%{_sbindir}
ln -s ../bin/MyODBC MyODBC-root
popd
# MYODBCConfig
install -d %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/MyODBC.desktop << EOF
[Desktop Entry]
Name=MyODBC
Comment=MyODBC Configuration
Exec=MyODBC
Terminal=false
Type=Application
Icon=databases_section
Categories=X-MandrivaLinux-MoreApplications-Databases;GTK;Database;Development;Application;
EOF
cat > %{buildroot}%{_datadir}/applications/MyODBC-root.desktop << EOF
[Desktop Entry]
Name=MyODBC-root
Comment=MyODBC Configuration (root user)
Exec=MyODBC-root
Terminal=false
Type=Application
Icon=databases_section
Categories=X-MandrivaLinux-MoreApplications-Databases;GTK;Database;Development;Application;
EOF
%endif
# cleanup
rm -rf %{buildroot}%{_datadir}/mysql-connector-odbc
cat > README.Mandriva << EOF
Please run this command when register:
%{_bindir}/myodbc-installer -d -a -n "MySQL ODBC 5.1 Driver" -t "DRIVER=%_libdir/libmyodbc5-%version.so;SETUP=%_libdir/libmyodbc3S-%version.so"
Please run this command when unregister:
%{_bindir}/myodbc-installer -d -r -n "MySQL ODBC 5.1 Driver"
EOF
%if %mdkversion < 200900
%post
%update_menus
%endif
%if %mdkversion < 200900
%postun
%clean_menus
%endif
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc ChangeLog LICENSE.gpl README README.debug README.Mandriva
%{_bindir}/*
%{_libdir}/libmyodbc3S-%version.so
%{_libdir}/libmyodbc5-%version.so
%files devel
%defattr(-,root,root)
%{_libdir}/libmyodbc3S.so
%{_libdir}/libmyodbc5.so
%{_libdir}/*.a
%{_libdir}/*.la
%changelog
* Tue Dec 07 2010 Funda Wang <fwang@mandriva.org> 5.1.8-1mdv2011.0
+ Revision: 613453
- 5.1.8
* Mon Dec 06 2010 Oden Eriksson <oeriksson@mandriva.com> 5.1.7-2mdv2011.0
+ Revision: 612975
- the mass rebuild of 2010.1 packages
- 5.1.7
* Thu Feb 18 2010 Oden Eriksson <oeriksson@mandriva.com> 5.1.6-2mdv2010.1
+ Revision: 507520
- rebuild
* Mon Nov 23 2009 Funda Wang <fwang@mandriva.org> 5.1.6-1mdv2010.1
+ Revision: 469267
- update desc
- New version 5.1.6
- New version 5.1.5
- rediff libname patch
- fix license (it is not public domain of course)
+ Thierry Vignaud <tv@mandriva.org>
- rebuild
+ Zombie Ryushu <ryushu@mandriva.org>
- Backport for 2009.1 test
+ Oden Eriksson <oeriksson@mandriva.com>
- rebuilt against mysql-5.1.30 libs
* Sat Jul 19 2008 Oden Eriksson <oeriksson@mandriva.com> 3.51.26-0.r1127.1mdv2009.0
+ Revision: 238811
- 3.51.26r1127
- added the dsn-editor.pro from 3.51.16r494 to fix build
- fix linkage (P2)
- sync with fedora (P1)
- fix deps
+ Funda Wang <fwang@mandriva.org>
- use qt3 macros
- new devel package name policy
- Rename to mysql-connector-odbc
- New version 3.51.22
+ Pixel <pixel@mandriva.com>
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+ Thierry Vignaud <tv@mandriva.org>
- drop old menu
- kill re-definition of %%buildroot on Pixel's request
- kill explicit icon extension
+ Olivier Blin <oblin@mandriva.com>
- restore BuildRoot
* Tue Sep 18 2007 Guillaume Rousse <guillomovitch@mandriva.org> 3.51.16-0.r494.2mdv2008.0
+ Revision: 89560
- rebuild
+ Thierry Vignaud <tv@mandriva.org>
- kill desktop-file-validate's error: string list key "Categories" in group "Desktop Entry" does not have a semicolon (";") as trailing character
* Sat Jun 16 2007 Oden Eriksson <oeriksson@mandriva.com> 3.51.16-0.r494.1mdv2008.0
+ Revision: 40359
- 3.51.16r494
- rediffed P0
* Wed Apr 18 2007 Oden Eriksson <oeriksson@mandriva.com> 3.51.14-0.r248.3mdv2008.0
+ Revision: 14798
- remove the faulty desktop-file-utils deps
* Tue Mar 13 2007 Oden Eriksson <oeriksson@mandriva.com> 3.51.14-0.r248.2mdv2007.1
+ Revision: 143067
- 3.51.14r248
- fix xdg menu
- rediffed one patch
- Import MyODBC
* Mon Jan 02 2006 Warly <warly@mandriva.com> 3.51.12-4mdv2007.1- new version
* Wed Nov 16 2005 Oden Eriksson <oeriksson@mandriva.com> 3.51.11-4mdk
- rebuilt against openssl-0.9.8a
* Sun Oct 30 2005 Oden Eriksson <oeriksson@mandriva.com> 3.51.11-3mdk
- rebuilt against MySQL-5.0.15
* Sat Jul 30 2005 Nicolas Lécureuil <neoclust@mandriva.org> 3.51.11-2mdk
- Fix BuildRequires
* Sun Jun 19 2005 Oden Eriksson <oeriksson@mandriva.com> 3.51.11-1mdk
- 3.51.11
- rebuilt against new librpm
- drop one redundant patch
- rediffed P0, and also fix sonames
* Mon Mar 07 2005 Oden Eriksson <oeriksson@mandrakesoft.com> 3.51.10-1mdk
- 3.51.10
- added P0,P1
- added P2 (fedora)
- lib64 fixes
- built all the binaries too, even the QT ones...
- ripped the menu magic from the unixODBC package
- misc spec file fixes
* Thu Apr 15 2004 Michael Scherer <misc@mandrake.org> 2.50.39-2mdk
- rebuild