- updated

Changed files:
    MyODBC.spec -> 1.22

diff --git a/MyODBC.spec b/MyODBC.spec
index cd4b6e58a5df1ff1eb63a3fabec853493d78ecd1..952fe6ab0c5de2dcd2b59f774a7f219f2788a67b 100644 (file)
--- a/MyODBC.spec
+++ b/MyODBC.spec
@@ -1,26 +1,29 @@
-# --with iodbs  build with libiodbc not with unixODBC
+%bcond_with    iodbs # build with libiodbc not with unixODBC
+
 Summary:       MyODBC: an ODBC driver for MySQL
 Summary(pl):   MyODBC: driver ODBC dla MySQL
 Name:          MyODBC
-Version:       3.51.06
+%define        sver    3.51
+Version:       %{sver}.07
 Release:       1
 License:       Public Domain
 Vendor:                MySQL AB
 Group:         Applications/Databases
 #Source0:      http://www.mysql.com/Downloads/MyODBC/%{name}-%{version}.tar.gz
 Source0:       ftp://sunsite.icm.edu.pl/pub/unix/mysql/Downloads/MyODBC3/%{name}-%{version}.tar.gz
-# Source0-md5: 5a59b4f01592fc9ec96e985bc7d6aada
+# Source0-md5: 80cda1784319505941c56aad5d7ac2a9
 URL:           http://www.mysql.com/
 BuildRequires: autoconf
 BuildRequires: automake
-%if %{?_with_iodbc:0}%{!?_with_iodbc:1}
-BuildRequires: unixODBC-devel
-%else
+%if %{with iodbs}
 BuildRequires: libiodbc-devel
+%else
+BuildRequires: unixODBC-devel
 %endif
 BuildRequires: libltdl-devel
 BuildRequires: libtool
 BuildRequires: mysql-devel >= 4.0.10
+Requires(post):        /usr/bin/odbcinst
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,18 +33,23 @@ MyODBC: an ODBC driver for MySQL.
 MyODBC: sterownik ODBC dla MySQL.
 
 %prep
-%setup -q
+%setup -q -n myodbc-%{sver}
 
 %build
-rm -f missing
+rm -rf missing autom*
 %{__libtoolize}
 %{__aclocal}
 %{__automake} -i
 %{__autoconf}
 %{__autoheader}
 %configure \
-       %{!?_with_iodbc:--with-unixODBC=/usr} \
-       %{?_with_iodbc:--with-iODBC=/usr --with-odbc-ini=/etc/odbc.ini}
+%if %{with iodbc}
+       --with-iODBC=/usr \
+       --with-odbc-ini=/etc/odbc.ini
+%else
+       --with-unixODBC=/usr
+%endif
+
 %{__make}
 
 %install
@@ -53,6 +61,18 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/ldconfig
+# install text driver
+/usr/bin/odbcinst -i -d -r <<EOF
+[MySQL]
+Description = ODBC for MySQL
+Driver = %{_libdir}/libmyodbc3.so
+FileUsage = 1
+EOF
+
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc INSTALL ChangeLog