- X11R6 is no more

[packages/MyODBC.git] / MyODBC.spec

diff --git a/MyODBC.spec b/MyODBC.spec
index baacdb31ac5dd065ceffb5d9d10a42fff854fc83..bea62a4c8a88dab7bc563d5c0cdd451707bddd2a 100644 (file)
--- a/MyODBC.spec
+++ b/MyODBC.spec
@@ -3,16 +3,16 @@
 %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
-Version:       3.51.10
+Version:       3.51.23
 Release:       1
-License:       GPL v2+
+License:       GPL v2+ + MySQL FLOSS Exception
 Vendor:                MySQL AB
 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: 34334272eb6f60dffc793c9aa3d29154
+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
@@ -31,23 +31,23 @@ 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):   MyODBC - Oparta o Qt biblioteka konfiguracyjna
+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
+%description qt -l pl.UTF-8
 MyODBC - Oparta o Qt biblioteka konfiguracyjna.
 
 %prep
-%setup -q
+%setup -q -n mysql-connector-odbc-%{version}r998
 
 %build
 %{__libtoolize}
@@ -55,8 +55,10 @@ MyODBC - Oparta o Qt biblioteka konfiguracyjna.
 %{__automake} -i
 %{__autoconf}
 %{__autoheader}
-LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}"
 %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
@@ -73,6 +75,7 @@ rm -rf $RPM_BUILD_ROOT
        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
@@ -94,7 +97,8 @@ EOF
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog INSTALL README
+%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