- X11R6 is no more

[packages/MyODBC.git] / MyODBC.spec

diff --git a/MyODBC.spec b/MyODBC.spec
index 952fe6ab0c5de2dcd2b59f774a7f219f2788a67b..bea62a4c8a88dab7bc563d5c0cdd451707bddd2a 100644 (file)
--- a/MyODBC.spec
+++ b/MyODBC.spec
@@ -1,21 +1,22 @@
-%bcond_with    iodbs # build with libiodbc not with unixODBC
-
+#
+# Conditional build:
+%bcond_with    iodbc   # build with libiodbc instead of unixODBC
+#
 Summary:       MyODBC: an ODBC driver for MySQL
-Summary(pl):   MyODBC: driver ODBC dla MySQL
+Summary(pl.UTF-8):     MyODBC: driver ODBC dla MySQL
 Name:          MyODBC
-%define        sver    3.51
-Version:       %{sver}.07
+Version:       3.51.23
 Release:       1
-License:       Public Domain
+License:       GPL v2+ + MySQL FLOSS Exception
 Vendor:                MySQL AB
-Group:         Applications/Databases
+Group:         Libraries
 #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: 80cda1784319505941c56aad5d7ac2a9
+Source0:       http://sunsite.icm.edu.pl/mysql/Downloads/Connector-ODBC/3.51/mysql-connector-odbc-%{version}r998.tar.gz
+# Source0-md5: 74b02e2771529db36f98120f4308f9c9
 URL:           http://www.mysql.com/
 BuildRequires: autoconf
 BuildRequires: automake
-%if %{with iodbs}
+%if %{with iodbc}
 BuildRequires: libiodbc-devel
 %else
 BuildRequires: unixODBC-devel
@@ -23,26 +24,41 @@ BuildRequires:      unixODBC-devel
 BuildRequires: libltdl-devel
 BuildRequires: libtool
 BuildRequires: mysql-devel >= 4.0.10
+BuildRequires: qt-devel
 Requires(post):        /usr/bin/odbcinst
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 MyODBC: an ODBC driver for MySQL.
 
-%description -l pl
+%description -l pl.UTF-8
 MyODBC: sterownik ODBC dla MySQL.
 
+%package qt
+Summary:       MyODBC - Qt-based setup library
+Summary(pl.UTF-8):     MyODBC - Oparta o Qt biblioteka konfiguracyjna
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description qt
+MyODBC - Qt-based setup library.
+
+%description qt -l pl.UTF-8
+MyODBC - Oparta o Qt biblioteka konfiguracyjna.
+
 %prep
-%setup -q -n myodbc-%{sver}
+%setup -q -n mysql-connector-odbc-%{version}r998
 
 %build
-rm -rf missing autom*
 %{__libtoolize}
 %{__aclocal}
 %{__automake} -i
 %{__autoconf}
 %{__autoheader}
 %configure \
+       --with-qt-libraries=%{_libdir} \
+       --with-qt-dir=/usr \
+       --with-qt-includes=/usr/include/qt \
 %if %{with iodbc}
        --with-iODBC=/usr \
        --with-odbc-ini=/etc/odbc.ini
@@ -58,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mysql-connector-odbc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,7 +92,19 @@ EOF
 
 %postun -p /sbin/ldconfig
 
+%post  qt -p /sbin/ldconfig
+%postun        qt -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc INSTALL ChangeLog
-%attr(755,root,root) %{_libdir}/libmyodbc*
+%doc ChangeLog LICENSE.exceptions README
+%attr(755,root,root) %{_bindir}/myodbc3*
+%attr(755,root,root) %{_libdir}/libmyodbc3-*.so
+%attr(755,root,root) %{_libdir}/libmyodbc3.so
+%attr(755,root,root) %{_libdir}/libmyodbc3_r-*.so
+%attr(755,root,root) %{_libdir}/libmyodbc3_r.so
+
+%files qt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmyodbc3S-*.so
+%attr(755,root,root) %{_libdir}/libmyodbc3S.so