Hi dear kernel team. As you know I am working on sparc port, but there is a
reqirement loop between unixODBC and qt3, so I made a patch which don't force
SQL link on qt3 (postgres, mysql and unixodbc). This permit build
libqt3-devel and after build unixODBC.
Please apply quickly !, I do not break nothing, and keep your flag to rebuild
it on old mdk distro.
--
Linux pour Mac !? Enfin le moyen de transformer
une pomme en v�ritable ordinateur. - JL.
Olivier Thauvin - http://nanardon.homelinux.org/
--- qt3.spec 2003-06-02 16:18:46.000000000 +0200
+++ qt3.spec.new 2003-06-11 00:15:03.000000000 +0200
@@ -18,10 +18,14 @@
%define libname libqt3
%endif
+# Olivier Thauvin, switch
+%define buildSQL 1
+%{?_without_SQL: %{expand: %%global buildSQL 0}}
+
Summary: Qt3 - Sources
Name: qt3
Version: 3.1.2
-Release: 6mdk
+Release: 7mdk
License: GPL and QPL
Group: System/Libraries
URL: http://www.troll.no/
@@ -111,42 +115,52 @@
%if %buildfor8_0
BuildRequires: db1 db3 freetype2-devel gawk libbzip2_1-devel
-BuildRequires: libunixODBC2-devel Mesa-common-devel MySQL-devel
-BuildRequires: postgresql-devel XFree86-devel
-BuildRequires: XFree86-static-libs zlib1-devel
+Buildrequires: Mesa-common-devel
+%if %buildSQL
+BuildRequires: libunixODBC2-devel
+BuildRequires: postgresql-devel MySQL-devel
+%endif
+BuildRequires: XFree86-static-libs zlib1-devel XFree86-devel
%endif
%if %buildfor8_1
BuildRequires: gcc-c++
BuildRequires: Mesa-common-devel libmng1-devel libpng2-devel
+%if %buildSQL
BuildRequires: MySQL-devel libunixODBC2-devel postgresql-devel
+%endif
BuildRequires: XFree86-static-libs gawk
%endif
%if %buildfor8_2
-BuildRequires: MySQL-devel XFree86-devel XFree86-libs
+%if %buildSQL
+BuildRequires: MySQL-devel libunixODBC2-devel postgresql-devel
+%endif
+BuildRequires: XFree86-devel XFree86-libs
BuildRequires: XFree86-static-libs freetype2-devel gawk libMesaGL1
BuildRequires: libMesaGLU1-devel libbinutils2 libbzip2_1-devel
-BuildRequires: libjpeg62-devel liblcms1 libmng1-devel libpng3-devel
-BuildRequires: libtermcap2 libunixODBC2-devel postgresql-devel
-BuildRequires: zlib1
+BuildRequires: libjpeg-devel liblcms1 libmng1-devel libpng-devel
+BuildRequires: libtermcap2 zlib1
%endif
%if %buildfor9_0
-BuildRequires: MySQL-devel XFree86-devel
-BuildRequires: freetype2-devel gawk libMesaGL1
+%if %buildSQL
+BuildRequires: MySQL-devel libunixODBC2-devel postgresql-devel
+%endif
+BuildRequires: freetype2-devel gawk libMesaGL1 XFree86-devel
BuildRequires: libMesaGLU1-devel libbinutils2 libbzip2_1-devel
BuildRequires: libjpeg62-devel liblcms1 libmng1-devel libpng3-devel
-BuildRequires: libtermcap2 libunixODBC2-devel postgresql-devel
-BuildRequires: zlib1
+BuildRequires: libtermcap2 zlib1
%endif
%if %buildfor9_1 || %buildfor9_2
-BuildRequires: MySQL-devel XFree86-devel
+%if %buildSQL
+BuildRequires: MySQL-devel libunixODBC2-devel postgresql-devel
+%endif
BuildRequires: freetype2-devel gawk libMesaGL1
-BuildRequires: libMesaGLU1-devel libbinutils2 libbzip2_1-devel
-BuildRequires: libjpeg62-devel liblcms1 libmng1-devel libpng3-devel
-BuildRequires: libtermcap2 libunixODBC2-devel postgresql-devel
+BuildRequires: libMesaGLU1-devel libbinutils libbzip2_1-devel
+BuildRequires: libjpeg-devel liblcms1 libmng1-devel libpng-devel
+BuildRequires: libtermcap2 XFree86-devel
BuildRequires: zlib1 libXft2-devel
%endif
@@ -329,6 +343,7 @@
%description -n %libname-common
This package contains all config file and language file
+%if %buildSQL
%package -n %libname-mysql
Summary: MySQL plugin for Qt
Group: Development/KDE and Qt
@@ -352,10 +367,10 @@
%description -n %libname-odbc
This package contain the ODBC plugin for Qt.
+%endif
%prep
-
%setup -q -n qt-x11-free-%version
#patch2 -p1
#%patch3 -p1
@@ -420,10 +435,9 @@
-enable-table \
-enable-xml \
-enable-opengl \
- -enable-sql \
- -plugin-sql-mysql \
- -plugin-sql-odbc \
- -plugin-sql-psql \
+%if %buildSQL
+ -enable-sql -plugin-sql-mysql -plugin-sql-odbc -plugin-sql-psql \
+%endif
-no-style-cde \
-no-style-compact \
-no-style-motif \
@@ -467,11 +481,11 @@
make install INSTALL_ROOT=%buildroot/
-
+%if %buildSQL
# David - 3.0.0-0.11mdk - Add SQL plugins (broken make install...)
install -d -m 0755 %buildroot/%qtdir/plugins/sqldrivers/
#install -m 0755 $RPM_BUILD_DIR/qt-x11-free-3.1.0/plugins/sqldrivers/*.so %buildroot/%qtdir/plugins/sqldrivers/
-
+%endif
# David - 3.0.0-0.11mdk - Fix some bad symlinks
cd %buildroot/%qtdir/%_lib/
@@ -752,7 +766,9 @@
%files -n %libname-common
%defattr(-,root,root,-)
%dir %qtdir/plugins
+%if %buildSQL
%dir %qtdir/plugins/sqldrivers
+%endif
%dir %qtdir/phrasebooks/
%qtdir/phrasebooks/*.qph
@@ -845,7 +861,7 @@
%dir %qtdir/plugins/designer
%qtdir/plugins/designer/*
-
+%if %buildSQL
%files -n %libname-mysql
%defattr(-,root,root)
%qtdir/plugins/sqldrivers/libqsqlmysql.so
@@ -857,8 +873,12 @@
%files -n %libname-odbc
%defattr(-,root,root)
%qtdir/plugins/sqldrivers/libqsqlodbc.so
+%endif
%changelog
+* Wed Jun 11 2003 Olivier Thauvin <[EMAIL PROTECTED]> 3.1.2-7mdk
+- add switch --without SQL
+
* Mon Jun 02 2003 Laurent MONTEL <[EMAIL PROTECTED]> 3.1.2-6mdk
- Patch qt to support -sysconfigdir parameter
