OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 18-Jul-2009 10:25:41
Branch: HEAD Handle: 2009071809254000
Modified files:
openpkg-src/libzdb libzdb.spec
Log:
no need for extra paths and move sqlite first as it is enabled by
default
Summary:
Revision Changes Path
1.9 +6 -8 openpkg-src/libzdb/libzdb.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libzdb/libzdb.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 libzdb.spec
--- openpkg-src/libzdb/libzdb.spec 3 Jul 2009 17:36:23 -0000 1.8
+++ openpkg-src/libzdb/libzdb.spec 18 Jul 2009 08:25:40 -0000 1.9
@@ -32,12 +32,12 @@
Group: Database
License: GPL (with exceptions)
Version: 2.6
-Release: 20090703
+Release: 20090718
# package options
+%option with_sqlite yes
%option with_mysql no
%option with_pgsql no
-%option with_sqlite yes
# list of sources
Source0: http://www.tildeslash.com/libzdb/dist/libzdb-%{version}.tar.gz
@@ -47,6 +47,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
PreReq: OpenPKG, openpkg >= 20060823
+%if "%{with_sqlite}" == "yes"
+BuildPreReq: sqlite
+PreReq: sqlite
+%endif
%if "%{with_mysql}" == "yes"
BuildPreReq: mysql, zlib
PreReq: mysql, zlib
@@ -55,10 +59,6 @@
BuildPreReq: openssl, postgresql
PreReq: openssl, postgresql
%endif
-%if "%{with_sqlite}" == "yes"
-BuildPreReq: sqlite
-PreReq: sqlite
-%endif
AutoReq: no
AutoReqProv: no
@@ -91,8 +91,6 @@
LIBS="$libs" \
./configure \
--prefix=%{l_prefix} \
- --includedir=%{l_prefix}/include/libzdb \
- --libdir=%{l_prefix}/lib/libzdb \
%if "%{with_sqlite}" == "yes"
--with-sqlite=%{l_prefix} \
%else
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
