OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Jul-2003 16:23:22
Branch: HEAD Handle: 2003072915232200
Modified files:
openpkg-src/qt qt.spec
Log:
Fix dependencies and make sql options conditional
Summary:
Revision Changes Path
1.72 +24 -2 openpkg-src/qt/qt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.71 -r1.72 qt.spec
--- openpkg-src/qt/qt.spec 29 Jul 2003 11:49:32 -0000 1.71
+++ openpkg-src/qt/qt.spec 29 Jul 2003 14:23:22 -0000 1.72
@@ -35,6 +35,10 @@
Version: 3.2.0
Release: 20030729
+# package options
+%option with_pgsql no
+%option with_mysql no
+
# list of sources
Source0: ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.bz2
@@ -43,6 +47,14 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030103, X11, gcc
PreReq: OpenPKG, openpkg >= 20030103, X11
+%if "%{with_pgsql}" == "yes"
+BuildPreReq: postgresql
+PreReq: postgresql
+%endif
+%if "%{with_mysql}" == "yes"
+BuildPreReq: mysql
+PreReq: mysql
+%endif
AutoReq: no
AutoReqProv: no
@@ -86,13 +98,18 @@
# special trolltech configuration
echo "yes" | ./configure \
+%if "%{with_pgsql}" == "yes"
+ -qt-sql-psql \
+%endif
+%if "%{with_mysql}" == "yes"
+ -qt-sql-mysql \
+%endif
-platform $oscomp \
-prefix %{l_prefix} \
-docdir %{l_prefix}/share/qt/doc \
-datadir %{l_prefix}/share/qt/data \
-release -static -stl -sm -qt-zlib \
-qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
- -qt-sql-psql -qt-sql-odbc -qt-sql-mysql \
-no-nis -no-cups -no-nas-sound -no-xinerama \
-no-xrender -no-xft -no-tablet -no-xkb \
-no-thread
@@ -105,13 +122,18 @@
# run configure a second time to get threaded libs as well
echo "yes" | ./configure \
+%if "%{with_pgsql}" == "yes"
+ -qt-sql-psql \
+%endif
+%if "%{with_mysql}" == "yes"
+ -qt-sql-mysql \
+%endif
-platform $oscomp \
-prefix %{l_prefix} \
-docdir %{l_prefix}/share/qt/doc \
-datadir %{l_prefix}/share/qt/data \
-release -static -stl -sm -qt-zlib \
-qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
- -qt-sql-psql -qt-sql-odbc -qt-sql-mysql \
-no-nis -no-cups -no-nas-sound -no-xinerama \
-no-xrender -no-xft -no-tablet -no-xkb \
-thread
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
