From 34488cc65c445476d58c3bc20d8247cbf9de3c6a Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 15 Oct 2020 13:15:00 -0700 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/unixODBC#9c24f27537dd68f4b98e65fd58e6c55c5b2941e1 --- .gitignore | 1 + ODBCConfig.desktop | 9 + README.dist | 31 +++ keep-typedefs.patch | 18 ++ odbcinst.ini | 57 ++++ so-version-bump.patch | 206 ++++++++++++++ sources | 1 + unixODBC.spec | 618 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 941 insertions(+) create mode 100644 ODBCConfig.desktop create mode 100644 README.dist create mode 100644 keep-typedefs.patch create mode 100644 odbcinst.ini create mode 100644 so-version-bump.patch create mode 100644 sources create mode 100644 unixODBC.spec diff --git a/.gitignore b/.gitignore index e69de29..c9e7bc8 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/unixODBC-*.tar.gz diff --git a/ODBCConfig.desktop b/ODBCConfig.desktop new file mode 100644 index 0000000..a208f00 --- /dev/null +++ b/ODBCConfig.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=ODBC Data Source Administrator +Comment=ODBC Data Source Administration Tool +Exec=ODBCConfig +Icon=LinuxODBC.xpm +Type=Application +Encoding=UTF-8 +Terminal=false +Categories=X-Red-Hat-Extra; diff --git a/README.dist b/README.dist new file mode 100644 index 0000000..6a68032 --- /dev/null +++ b/README.dist @@ -0,0 +1,31 @@ +About unixODBC in this distribution +----------------------------------- + +In addition to the unixODBC package itself, you will want to install some +or all of these related packages: + +mysql-connector-odbc MySQL driver, needed to connect to MySQL databases +postgresql-odbc PostgreSQL driver, needed to connect to PostgreSQL +unixODBC-gui-qt Optional configuration management and test programs + + +The recommended driver definition for MySQL 8 is: + +[MySQL] +Description = ODBC for MySQL 8 +Driver = /usr/lib/libmyodbc8.so +Driver64 = /usr/lib64/libmyodbc8.so +FileUsage = 1 + +You can adjust the name (in square brackets) and the description, but +the other items should usually be used verbatim. + +The recommended driver definition for PostgreSQL is: + +[PostgreSQL] +Description = ODBC for PostgreSQL +Driver = /usr/lib/psqlodbcw.so +Setup = /usr/lib/libodbcpsqlS.so +Driver64 = /usr/lib64/psqlodbcw.so +Setup64 = /usr/lib64/libodbcpsqlS.so +FileUsage = 1 diff --git a/keep-typedefs.patch b/keep-typedefs.patch new file mode 100644 index 0000000..7f577f2 --- /dev/null +++ b/keep-typedefs.patch @@ -0,0 +1,18 @@ +Upstream has decided to deprecate these typedefs, but experience so far +says that removing them just breaks code to little purpose. + + +diff -Naur unixODBC-2.2.14.orig/include/sqltypes.h unixODBC-2.2.14/include/sqltypes.h +--- unixODBC-2.2.14.orig/include/sqltypes.h 2008-10-31 12:21:53.000000000 -0400 ++++ unixODBC-2.2.14/include/sqltypes.h 2009-02-16 13:28:50.000000000 -0500 +@@ -170,6 +170,10 @@ + typedef SQLUINTEGER SQLROWSETSIZE; + typedef SQLLEN SQLROWOFFSET; + */ ++typedef SQLULEN SQLROWCOUNT; ++typedef SQLULEN SQLROWSETSIZE; ++typedef SQLULEN SQLTRANSID; ++typedef SQLLEN SQLROWOFFSET; + #endif + #else + typedef long SQLINTEGER; diff --git a/odbcinst.ini b/odbcinst.ini new file mode 100644 index 0000000..471f20e --- /dev/null +++ b/odbcinst.ini @@ -0,0 +1,57 @@ +# Example driver definitions + +# Driver from the postgresql-odbc package +# Setup from the unixODBC package +[PostgreSQL] +Description = ODBC for PostgreSQL +Driver = /usr/lib/psqlodbcw.so +Setup = /usr/lib/libodbcpsqlS.so +Driver64 = /usr/lib64/psqlodbcw.so +Setup64 = /usr/lib64/libodbcpsqlS.so +FileUsage = 1 + + +# Driver from the mysql-connector-odbc package in Fedora >=29 +# Setup from the unixODBC package +[MySQL] +Description = ODBC for MySQL 8 +# mysql-connector-odbc package provides shared libraries with "w" or "a" suffix. +# 'w' stands for 'wide' or 'unicode' character set, 'a' stands for 'ANSI' +# Symlinks used in the configuration below lead to the 'w' variant by default +Driver = /usr/lib/libmyodbc8.so +Driver64 = /usr/lib64/libmyodbc8.so +FileUsage = 1 + + +# Driver from the mysql-connector-odbc package in Fedora <=28 +# Setup from the unixODBC package +[MySQL-5] +Description = ODBC for MySQL 5 +# mysql-connector-odbc package provides shared libraries with "w" or "a" suffix. +# 'w' stands for 'wide' or 'unicode' character set, 'a' stands for 'ANSI' +# Symlinks used in the configuration below lead to the 'w' variant by default +Driver = /usr/lib/libmyodbc5.so +Driver64 = /usr/lib64/libmyodbc5.so +Setup = /usr/lib/libodbcmyS.so +Setup64 = /usr/lib64/libodbcmyS.so +FileUsage = 1 + + +# Driver from the freetds-libs package +# Setup from the unixODBC package +[FreeTDS] +Description = Free Sybase & MS SQL Driver +Driver = /usr/lib/libtdsodbc.so +Setup = /usr/lib/libtdsS.so +Driver64 = /usr/lib64/libtdsodbc.so +Setup64 = /usr/lib64/libtdsS.so +Port = 1433 + + +# Driver from the mariadb-connector-odbc package +# Setup from the unixODBC package +[MariaDB] +Description = ODBC for MariaDB +Driver = /usr/lib/libmaodbc.so +Driver64 = /usr/lib64/libmaodbc.so +FileUsage = 1 diff --git a/so-version-bump.patch b/so-version-bump.patch new file mode 100644 index 0000000..faa6072 --- /dev/null +++ b/so-version-bump.patch @@ -0,0 +1,206 @@ +Set the major .so version to 2 for all unixODBC shared libraries, to reflect +the incompatible ABI changes in 2.2.14. + +diff -up unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am.soname unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am +--- unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am.soname 2015-08-22 18:39:16.000000000 +0200 ++++ unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am 2015-08-25 12:27:47.005775376 +0200 +@@ -193,6 +193,6 @@ EXTRA_DIST = \ + _sqlFreeEnv.c \ + _sqlFreeStmt.c + +-libodbcmini_la_LDFLAGS = -no-undefined -version-info 1:0:0 \ ++libodbcmini_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) \ + -L@msql_libraries@ -lmsql -module + +diff -up unixODBC-2.3.3/Drivers/nn/Makefile.am.soname unixODBC-2.3.3/Drivers/nn/Makefile.am +--- unixODBC-2.3.3/Drivers/nn/Makefile.am.soname 2014-05-05 10:27:13.000000000 +0200 ++++ unixODBC-2.3.3/Drivers/nn/Makefile.am 2015-08-25 12:27:47.007775386 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libnn.la + + AM_CPPFLAGS = -I@top_srcdir@/include -I. + +-libnn_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libnn_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + EXTRA_DIST = \ + nnconfig.h \ +diff -up unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am.soname unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am +--- unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am.soname 2014-05-05 10:27:13.000000000 +0200 ++++ unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am 2015-08-25 12:27:47.009775396 +0200 +@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libodbcpsql.la + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + + libodbcpsql_la_LDFLAGS = \ +- -version-info 2:0:0 \ ++ -version-info $(LIB_VERSION) \ + -no-undefined \ + $(LIBSOCKET) $(LIBNSL) \ + -export-dynamic \ +diff -up unixODBC-2.3.3/Drivers/template/Makefile.am.soname unixODBC-2.3.3/Drivers/template/Makefile.am +--- unixODBC-2.3.3/Drivers/template/Makefile.am.soname 2014-05-05 10:27:13.000000000 +0200 ++++ unixODBC-2.3.3/Drivers/template/Makefile.am 2015-08-25 12:27:47.012775410 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libtemplate.la + + AM_CPPFLAGS = -I@top_srcdir@/include -I. $(LTDLINCL) + +-libtemplate_la_LDFLAGS = -no-undefined -version-info 1:0:0 ++libtemplate_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) + + EXTRA_DIST = \ + driver.h \ +diff -up unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am.soname unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am +--- unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am 2015-08-25 12:27:47.014775420 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcdrvcfg1S.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcdrvcfg1S_la_SOURCES = drvcfg1.c + +diff -up unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am.soname unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am +--- unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am 2015-08-25 12:27:47.016775430 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcdrvcfg2S.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcdrvcfg2S_la_SOURCES = drvcfg2.c + +diff -up unixODBC-2.3.3/DRVConfig/esoob/Makefile.am.soname unixODBC-2.3.3/DRVConfig/esoob/Makefile.am +--- unixODBC-2.3.3/DRVConfig/esoob/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/esoob/Makefile.am 2015-08-25 12:27:47.017775434 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libesoobS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libesoobS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libesoobS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libesoobS_la_SOURCES = esoobS.c + +diff -up unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am.soname unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am +--- unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am 2015-08-25 12:27:47.019775444 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmimerS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libmimerS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libmimerS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libmimerS_la_SOURCES = mimerS.c + +diff -up unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am.soname unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am +--- unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am 2015-08-25 12:27:47.020775449 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcminiS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcminiS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcminiS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcminiS_la_SOURCES = odbcminiS.c + +diff -up unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am.soname unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am +--- unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am 2015-08-25 12:27:47.023775464 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcmyS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcmyS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcmyS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcmyS_la_SOURCES = odbcmyS.c + +diff -up unixODBC-2.3.3/DRVConfig/nn/Makefile.am.soname unixODBC-2.3.3/DRVConfig/nn/Makefile.am +--- unixODBC-2.3.3/DRVConfig/nn/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/nn/Makefile.am 2015-08-25 12:27:47.024775469 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcnnS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcnnS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcnnS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcnnS_la_SOURCES = drvcfg.c + +diff -up unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am.soname unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am +--- unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am 2015-08-25 12:27:47.026775478 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liboplodbcS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-liboplodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++liboplodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + liboplodbcS_la_SOURCES = oplodbc.c + +diff -up unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am.soname unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am +--- unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am 2015-08-25 12:27:47.027775483 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liboraodbcS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-liboraodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++liboraodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + liboraodbcS_la_SOURCES = oraodbcS.c + +diff -up unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am.soname unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am +--- unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am 2015-08-25 12:27:47.029775493 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcpsqlS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcpsqlS_la_SOURCES = odbcpsqlS.c + +diff -up unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am.soname unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am +--- unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am 2015-08-25 12:27:47.031775503 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libsapdbS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libsapdbS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libsapdbS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libsapdbS_la_SOURCES = sapdb.c + +diff -up unixODBC-2.3.3/DRVConfig/tds/Makefile.am.soname unixODBC-2.3.3/DRVConfig/tds/Makefile.am +--- unixODBC-2.3.3/DRVConfig/tds/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/tds/Makefile.am 2015-08-25 12:27:47.032775507 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libtdsS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libtdsS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libtdsS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libtdsS_la_SOURCES = tdsS.c + +diff -up unixODBC-2.3.3/DRVConfig/txt/Makefile.am.soname unixODBC-2.3.3/DRVConfig/txt/Makefile.am +--- unixODBC-2.3.3/DRVConfig/txt/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200 ++++ unixODBC-2.3.3/DRVConfig/txt/Makefile.am 2015-08-25 12:27:47.034775517 +0200 +@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbctxtS.la + + AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL) + +-libodbctxtS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbctxtS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbctxtS_la_SOURCES = drvcfg.c + diff --git a/sources b/sources new file mode 100644 index 0000000..4ca57a5 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (unixODBC-2.3.7.tar.gz) = a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70 diff --git a/unixODBC.spec b/unixODBC.spec new file mode 100644 index 0000000..08bee6e --- /dev/null +++ b/unixODBC.spec @@ -0,0 +1,618 @@ +Summary: A complete ODBC driver manager for Linux +Name: unixODBC +Version: 2.3.7 +Release: 7%{?dist} +URL: http://www.unixODBC.org/ +# Programs are GPL, libraries are LGPL, except News Server library is GPL. +License: GPLv2+ and LGPLv2+ + +Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz +Source1: odbcinst.ini +Source5: README.dist + +Patch8: so-version-bump.patch +Patch9: keep-typedefs.patch + +Conflicts: iodbc + +BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex +BuildRequires: readline-devel +BuildRequires: multilib-rpm-config + +%description +Install unixODBC if you want to access databases through ODBC. +You will also need the mariadb-connector-odbc package if you want to access +a MySQL or MariaDB database, and/or the postgresql-odbc package for PostgreSQL. + +%package devel +Summary: Development files for programs which will use the unixODBC library +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The unixODBC package can be used to access databases through ODBC +drivers. If you want to develop programs that will access data through +ODBC, you need to install this package. + +%prep +%setup -q +%patch8 -p1 -b .soname-bump +%patch9 -p1 + +chmod 0644 Drivers/MiniSQL/*.c +chmod 0644 Drivers/nn/*.c +chmod 0644 Drivers/template/*.c +chmod 0644 doc/ProgrammerManual/Tutorial/*.html +chmod 0644 doc/lst/* +chmod 0644 include/odbcinst.h + +autoreconf -vfi + + +%build +# unixODBC 2.2.14 is not aliasing-safe +CFLAGS="%{optflags} -fno-strict-aliasing" +CXXFLAGS="$CFLAGS" +export CFLAGS CXXFLAGS + +%configure --with-gnu-ld=yes --enable-threads=yes \ + --enable-drivers=yes --enable-driverc=yes + +# Get rid of the rpaths +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +make all + +%install +make DESTDIR=$RPM_BUILD_ROOT install +install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} +%multilib_fix_c_header --file %{_includedir}/unixodbc_conf.h + +# add some explanatory documentation +cp %{SOURCE5} README.dist + +# remove obsolete Postgres drivers from the package (but not the setup code) +rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so* + +# copy text driver documentation into main doc directory +# currently disabled because upstream no longer includes text driver +# mkdir -p doc/Drivers/txt +# cp -pr Drivers/txt/doc/* doc/Drivers/txt + +# don't want to install doc Makefiles as docs +find doc -name 'Makefile*' | xargs rm + +# we do not want to ship static libraries +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a + +# remove unpackaged files from the buildroot +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.* +rm -rf $RPM_BUILD_ROOT%{_datadir}/libtool + +# initialize lists of .so files +find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > base-so-list +find $RPM_BUILD_ROOT%{_libdir} -name "*.so" | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list + +# move these to main package, they're often dlopened... +for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so libtdsS.so +do + echo "%{_libdir}/$lib" >> base-so-list + grep -v "/$lib$" devel-so-list > devel-so-list.x + mv -f devel-so-list.x devel-so-list +done + +%files -f base-so-list +%doc README COPYING AUTHORS ChangeLog NEWS doc +%doc README.dist +%config(noreplace) %{_sysconfdir}/odbc* +%{_bindir}/odbcinst +%{_bindir}/isql +%{_bindir}/dltest +%{_bindir}/iusql +%{_bindir}/odbc_config +%{_bindir}/slencheck +%{_mandir}/man*/* + +%files devel -f devel-so-list +%{_includedir}/* +%_libdir/pkgconfig/*.pc + +%ldconfig_scriptlets + +%changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.3.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.3.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.3.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 17 2019 Igor Gnatenko - 2.3.7-4 +- Rebuild for readline 8.0 + +* Sun Feb 03 2019 Fedora Release Engineering - 2.3.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Nov 30 2018 Michal Schorm - 2.3.7-2 +- Bump for rebuild to ship updated configuration + +* Sat Aug 11 2018 Pavel Raiskup - 2.3.7-1 +- update to version 2.3.7 + +* Sat Jul 14 2018 Fedora Release Engineering - 2.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Apr 27 2018 Pavel Raiskup - 2.3.6-1 +- update to version 2.3.6 + +* Wed Mar 07 2018 Honza Horak - 2.3.5-3 +- Bump for a rebuild + +* Tue Feb 20 2018 Pavel Raiskup - 2.3.5-2 +- cleanup autotool hacks + +* Mon Feb 19 2018 Jan Staněk - 2.3.5-1 +- Update to version 2.3.5 + +* Fri Feb 09 2018 Fedora Release Engineering - 2.3.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 03 2018 Honza Horak - 2.3.4-9 +- Include mariadb-connector-odbc driver spec in the odbcinst.ini + +* Wed Aug 30 2017 Tomas Repik - 2.3.4-8 +- move libtdsS.so to the main package and add tds config to odbcinst.ini +- rhbz#1448890 + +* Thu Aug 03 2017 Fedora Release Engineering - 2.3.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jan 12 2017 Igor Gnatenko - 2.3.4-4 +- Rebuild for readline 7.x + +* Wed Jun 22 2016 Pavel Raiskup - 2.3.4-3 +- delegate multilib hacks to multilib-rpm-config package + +* Fri Feb 05 2016 Fedora Release Engineering - 2.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Sep 01 2015 Jan Stanek - 2.3.4-1 +- Update to version 2.3.4 + +* Tue Aug 25 2015 Jan Stanek - 2.3.3-1 +- Update to version 2.3.3 +- Removed patches and sources included upstream +- Recreated so-version-bump.patch + +* Wed Aug 12 2015 Jan Stanek - 2.3.2-8 +- Backported changes necessary for building with new autotools version. + +* Fri Jun 19 2015 Fedora Release Engineering - 2.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 2.3.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Feb 18 2014 Jan Stanek - 2.3.2-4 +- Added manual pages for iusql, dltest, odbc_config + +* Fri Dec 06 2013 Jan Stanek - 2.3.2-3 +- Renamed README.fedora to README.dist + +* Thu Oct 24 2013 Jan Stanek - 2.3.2-2 +- Add man page describing enviromental variables (#991018) + +* Thu Oct 10 2013 Jan Stanek - 2.3.2-1 +- Update to 2.3.2 version +- Removed extra man-pages and patch already shipped by upstream + +* Sun Aug 04 2013 Fedora Release Engineering - 2.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jul 4 2013 Honza Horak 2.3.1-6 +- Spec file clean-up +- Provide man pages created by Jan Stanek + +* Thu Jul 4 2013 Honza Horak 2.3.1-5 +- Fix Coverity patch + Resolves: #981060 + +* Tue Mar 19 2013 Tom Lane 2.3.1-4 +- Fix assorted small bugs found by Coverity +Related: #760877 + +* Fri Feb 15 2013 Fedora Release Engineering - 2.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 2.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jan 10 2012 Tom Lane 2.3.1-1 +- Update to version 2.3.1. The main externally-visible change is that the + GUI programs are not part of the unixODBC tarball anymore, so they are no + longer in this package, and the unixODBC-kde sub-RPM has disappeared. + There is a separate package unixODBC-gui-qt that now provides those programs. + +* Mon Feb 07 2011 Fedora Release Engineering - 2.2.14-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Aug 31 2010 Tom Lane 2.2.14-12 +- Fix isql crash at EOF with -b option +Resolves: #628909 + +* Mon May 3 2010 Tom Lane 2.2.14-11 +- Re-add accidentally-removed desktop icon for ODBCConfig +Related: #587933 + +* Sat Mar 13 2010 Kevin Kofler 2.2.14-10 +- BR qt-assistant-adp-devel + +* Sat Dec 19 2009 Tom Lane 2.2.14-9 +- Fix bug preventing drivers from being selected in ODBCConfig +Resolves: #544852 + +* Wed Nov 25 2009 Kevin Kofler 2.2.14-8 +- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI) + +* Thu Oct 15 2009 Tom Lane 2.2.14-7 +- 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 2.2.14-6 +- Switch to building against qt4, not qt3. This means the DataManager, + DataManagerII, and odbctest applications are gone. +Resolves: #514064 +- Use Driver64/Setup64 to eliminate need for hand-adjustment of odbcinst.ini +Resolves: #514688 +- Fix misdeclaration of SQLBIGINT and SQLUBIGINT in generated header files +Resolves: #518623 + +* Sun Jul 26 2009 Fedora Release Engineering - 2.2.14-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jun 9 2009 Peter Lemenkov - 2.2.14-4 +- Properly install *.desktop files +- No need to ship INSTALL in docs +- Use macros instead of hardcoded /usr/share and /usr/include +- fixed permissions on some doc- and src-files +- Almost all rpmlint messages are gone now + +* Sat Jun 06 2009 Dennis Gilmore - 2.2.14-3 +- add sparc support to the multilib includes header + +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 20 2009 Tom Lane 2.2.14-1 +- Update to unixODBC 2.2.14. Note this involves an ABI break and a consequent + soname version bump, because upstream fixed some mistakes in the widths of + some API datatypes for 64-bit platforms. Also, the formerly embedded + mysql, postgresql, and text drivers have been removed. (For mysql and + postgresql, use the separate mysql-connector-odbc and postgresql-odbc + packages, which are far more up to date. The text driver is not currently + shipped by upstream at all, but might get revived as a separate SRPM later.) +- Stop shipping .a library files, per distro policy. +- Fixes for libtool 2.2. + +* Mon Jul 28 2008 Tom Lane 2.2.12-9 +- Fix build failure caused by new default patch fuzz = 0 policy in rawhide. + +* Fri Jun 13 2008 Tom Lane 2.2.12-8 +- Install icons in /usr/share/pixmaps, not /usr/share/icons as this package + has historically done; the former is considered correct. + +* Fri Apr 4 2008 Tom Lane 2.2.12-7 +- Must BuildRequire qt3 now that Fedora has renamed qt4 to qt +Resolves: #440798 + +* Mon Feb 11 2008 Tom Lane 2.2.12-6 +- Move libodbcinst.so symlink into main package, since it's often dlopen'd +Related: #204882 +- Clean up specfile's ugly coding for making base-vs-devel decisions + +* Sun Dec 30 2007 Tom Lane 2.2.12-5 +- Add missing BuildRequires for flex. +Resolves: #427063 + +* Thu Aug 2 2007 Tom Lane 2.2.12-4 +- Update License tag to match code. + +* Fri Apr 20 2007 Tom Lane 2.2.12-3 +- Make configure find correct Qt libraries when building on a multilib machine + +* Mon Apr 16 2007 Tom Lane 2.2.12-2 +- Drop BuildRequires for kdelibs-devel +Resolves: #152717 +- Clean up a few rpmlint complaints + +* Wed Dec 6 2006 Tom Lane 2.2.12-1 +- Update to unixODBC 2.2.12. +- Add missing BuildPrereq for bison. +Resolves: #190427 + +* Wed Jul 12 2006 Jesse Keating - 2.2.11-7.1 +- rebuild + +* Mon Mar 27 2006 Tom Lane 2.2.11-7 +- Fix minor problems in desktop files (bug #185764) + +* Fri Feb 10 2006 Jesse Keating - 2.2.11-6.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.2.11-6.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Nov 21 2005 Tom Lane 2.2.11-6 +- Patch NO-vs-no discrepancy between aclocal/acinclude and recent autoconf + versions (not sure if this has been broken for a long time, or was just + exposed by modular X changeover). +- Apparently need to require libXt-devel too for modular X. + +* Mon Nov 7 2005 Tom Lane 2.2.11-5 +- Adjust BuildPrereq for modular X. + +* Sun Oct 16 2005 Florian La Roche 2.2.11-4 +- link against dependent libs +- fix some bugs to resolve unknown symbols ;-( + +* Thu Sep 29 2005 Tom Lane 2.2.11-3 +- Force update of yac.h because the copy in the distributed tarball does not + match bison 2.0's numbering of symbols (bz #162676) +- Include documentation of text-file driver +- Use private libltdl so we can omit RTLD_GLOBAL from dlopen flags (bz #161399) + +* Sat Sep 24 2005 Tom Lane 2.2.11-2 +- Remove Makefiles accidentally included in docs installation (bz #168819) +- Updates to keep newer libtool code from installing itself as part of package + +* Fri Apr 8 2005 Tom Lane 2.2.11-1 +- Update to unixODBC 2.2.11 + +* Mon Mar 7 2005 Tom Lane 2.2.10-3 +- Rebuild with gcc4. + +* Wed Jan 12 2005 Tim Waugh 2.2.10-2 +- Rebuilt for new readline. + +* Thu Oct 28 2004 Tom Lane 2.2.10-1 +- Update to unixODBC 2.2.10 + +* Wed Sep 22 2004 Tom Lane 2.2.9-1 +- Update to unixODBC 2.2.9 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Sat May 8 2004 Tom Lane 2.2.8-5 +- Backpatch fix for double-free error from upstream devel sources. +- rebuilt + +* Wed May 5 2004 Tom Lane 2.2.8-4 +- Add dependency to ensure kde subpackage stays in sync with main + (needed because we moved odbctest from one pkg to the other, + cf bug #122478) +- rebuilt + +* Wed Mar 10 2004 Tom Lane 2.2.8-3 +- Use installed libltdl +- rebuilt for Fedora Core 2 + +* Tue Mar 9 2004 Tom Lane 2.2.8-2 +- Rename lo_xxx() to odbc_lo_xxx() (bug #117211) (temporary until 2.2.9) +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Mon Mar 1 2004 Tom Lane +- Update to 2.2.8 +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Dec 4 2003 Joe Orton 2.2.5-10 +- rebuild to restore sqltypes.h after #111195 + +* Thu Oct 16 2003 Fernando Nasser 2.2.5-9 +- Add XFree86-devel to the list of BuildPrereq. Did not bump + release as there is no need to rebuild. + +* Thu Oct 16 2003 Fernando Nasser 2.2.5-9 +- Add comments to the /etc/odbcinst.ini file regarding the proper + setup for MySQL and the origin of each library needed. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-8 +- Move libodbcmyS.so to the main package as well. It is used the + same way as libodbcpsqlS.so. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-7 +- Bumped the version so it rebuilds. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-4 +- Revert previous change and special case libodbcpsql.so and + libodbcpsqlS.so instead. Here is the explanation (from Elliot + Lee): + ".so files are only used at link time for normal dynamic libraries. + The libraries referred to here are being used as dynamically loaded + modules, so I guess moving those particular .so files back to the + main package would make sense, but the other .so files should stay + in the devel subpackage." + +* Fri Oct 10 2003 Fernando Nasser 2.2.5-3 +- Moved all the shared library symlinks to the main package. + They were deliberatedly being added to the devel package for + unknown reasons but this was forcing users to install the + devel package always. +- No need to special-case libodbc.so anymore + +* Fri Sep 05 2003 Elliot Lee 2.2.5-2 +- Run auto* so it rebuilds. + +* Mon Jul 07 2003 Fernando Nasser 2.2.5-1 +- Moved odbctest to the kde package to remove require on Qt stuff + from the main package. +- Removed stray "\" from doc/Makefile.am +- Applied libtool fix (provided by Alex Oliva) so that it build + with cross-compilers (which are used by 64 bit systems) +- Updated sources to the 2.2.5 community release +- Changed the included libtool to the 1.5-3 one so that + it properly link the libraries with the newly generated ones + and not with the ones installed on the build system (or give + an error if an old version is not installed (# 91110) +- Added new files for executable DataManagerII and icons LinuxODBC.xpm + and odbc.xpm + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Jan 9 2003 Bill Nottingham 2.2.3-5 +- debloat + +* Tue Dec 17 2002 Elliot Lee 2.2.3-4 +- Run libtoolize etc. + +* Thu Dec 12 2002 Elliot Lee 2.2.3-3 +- Rebuild to fix filelist errors...? + +* Fri Nov 29 2002 Tim Powers 2.2.3-2 +- remove unpackaged files from the buildroot + +* Tue Nov 19 2002 Elliot Lee 2.2.3-1 +- Rebuild, update to 2.2.3 + +* Mon Aug 26 2002 Trond Eivind Glomsrd 2.2.2-3 +- Move libodbc.so to the main package, so programs dlopening + it don't break (#72653) + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Trond Eivind Glomsrd 2.2.2-1 +- 2.2.2 +- desktop file changes (# 69371) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Mon May 20 2002 Trond Eivind Glomsrd 2.2.1-1 +- 2.2.1 +- Reenable other archs, as this should now build on 64 bit archs + +* Sun May 19 2002 Florian La Roche +- add at least mainframe; should this really be a i386-only rpm? + +* Wed Apr 17 2002 Bernhard Rosenkraenzer 2.2.0-5 +- rebuild + +* Fri Apr 5 2002 Trond Eivind Glomsrd 2.2.0-4 +- Avoid having files in more than one package (#62755) + +* Tue Mar 26 2002 Trond Eivind Glomsrd 2.2.0-3 +- Don't include kde plugin .so as a devel symlink (#61039) + +* Fri Mar 8 2002 Bernhard Rosenkraenzer 2.2.0-2 +- Rebuild with KDE 3.x + +* Tue Feb 26 2002 Trond Eivind Glomsrd 2.2.0-1 +- Just build on i386 now, there are 64 bit oddities +- 2.2.0 + +* Fri Jan 11 2002 Trond Eivind Glomsrd 2.1.1-2 +- move libodbcinstQ* to the kde subpackage + +* Fri Jan 11 2002 Trond Eivind Glomsrd 2.1.1-1 +- 2.1.1 +- minor cleanups + +* Fri Dec 14 2001 Trond Eivind Glomsrd 2.0.7-5 +- Rebuild + +* Wed Sep 12 2001 Tim Powers +- rebuild with new gcc and binutils + +* Sun Jun 24 2001 Than Ngo +- rebuild against qt-2.3.1, kde-2.1.x + +* Fri Jun 15 2001 Trond Eivind Glomsrd +- Better default odbcinst.ini +- Minor cleanups + +* Wed Jun 6 2001 Trond Eivind Glomsrd +- 2.0.7 + +* Wed Apr 25 2001 Trond Eivind Glomsrd +- Fix for isql segfault on EOF/ctrl-d exit + +* Fri Apr 20 2001 Trond Eivind Glomsrd +- 2.0.6 +- add patch for 64 bit archs (dword shouldn't be "long int") + +* Wed Feb 28 2001 Trond Eivind Glomsrd +- rebuild + +* Tue Nov 28 2000 Trond Eivind Glomsrd +- 1.8.13 + +* Tue Oct 10 2000 Trond Eivind Glomsrd +- enable GUI now that we have KDE compiled with the standard + compiler +- move the applnk entries to the KDE package + +* Thu Aug 24 2000 Nalin Dahyabhai +- add the missing shared libs to the non-devel package + +* Wed Aug 23 2000 Preston Brown +- 1.8.12 fixes problems with the postgresql driver + +* Mon Jul 31 2000 Trond Eivind Glomsrd +- disable KDE subpackage to avoid the mess that is C++ binary + compatibility + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Fri Jun 30 2000 Florian La Roche +- improved QTDIR detection + +* Wed Jun 28 2000 Trond Eivind Glomsrd +- 1.8.10 +- use %%{_tmppath} +- update URL +- including two missing libraries + +* Tue Jun 13 2000 Preston Brown +- 1.8.9 + +* Fri Jun 09 2000 Preston Brown +- adopted for Winston, changed to Red Hat packaging standards + +* Tue Apr 18 2000 Murray Todd Williams +- added a unixODBC-devel RPM to the group, added KDE links and icons to system +- all of which came from recommendations from Fredrick Meunier +- + +* Mon Apr 17 2000 Murray Todd Williams +- unixODBC-1.8.7 +- moved install to $RPM_BUILD_ROOT so it didn't overrun existing files.