OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Jul-2004 08:50:10
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/sqlite sqlite.spec
Log:
whoohooo: SQLite 3.x is entirely incompatible to SQLite 2.x (both
database format and API), so we have to provide both
Summary:
Revision Changes Path
1.65 +64 -33 openpkg-src/sqlite/sqlite.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec 1 Jul 2004 06:08:08 -0000 1.64
+++ openpkg-src/sqlite/sqlite.spec 1 Jul 2004 06:50:10 -0000 1.65
@@ -23,6 +23,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_stable 2.8.14
+%define V_beta 3.0.2
+
# package information
Name: sqlite
Summary: SQL Lite
@@ -33,7 +37,7 @@
Class: BASE
Group: Database
License: PD
-Version: 3.0.2
+Version: %{V_stable}
Release: 20040701
# package options
@@ -42,7 +46,8 @@
%option with_readline no
# list of sources
-Source0: http://www.hwaci.com/sw/sqlite/sqlite-%{version}.tar.gz
+Source0: http://www.hwaci.com/sw/sqlite/sqlite-%{V_stable}.tar.gz
+Source1: http://www.hwaci.com/sw/sqlite/sqlite-%{V_beta}.tar.gz
Patch0: sqlite.patch
# build information
@@ -70,46 +75,62 @@
%track
prog sqlite = {
- version = %{version}
+ version = %{V_stable}
+ url = http://www.hwaci.com/sw/sqlite/download.html
+ regex = sqlite-(2\.\d+\.\d+)\.tar\.gz
+ }
+ prog sqlite:beta = {
+ version = %{V_beta}
url = http://www.hwaci.com/sw/sqlite/download.html
regex = sqlite-(__VER__)\.tar\.gz
}
%prep
- %setup -q -n sqlite
- %{l_shtool} subst \
- -e '/LINENO: error: C\+\+ preprocessor/{N;N;N;N;s/.*/:/;}' \
- configure
- chmod a+x install-sh
- %patch -p0
+ %setup -q -c
+ mv sqlite sqlite-%{V_stable}
+ %setup -q -D -T -a 1
+ mv sqlite sqlite-%{V_beta}
+ for dir in sqlite-%{V_stable} sqlite-%{V_beta}; do
+ ( cd $dir
+ %{l_shtool} subst \
+ -e '/LINENO: error: C\+\+ preprocessor/{N;N;N;N;s/.*/:/;}' \
+ configure
+ chmod a+x install-sh
+ %patch -p0
+ ) || exit $?
+ done
%build
- CC="%{l_cc}"
- export CC
- CPPFLAGS="%{l_cppflags}"
- export CPPFLAGS
- CFLAGS="%{l_cflags -O}"
- export CFLAGS
- LDFLAGS="%{l_ldflags}"
- export LDFLAGS
- LIBS=""
- export LIBS
+ for dir in sqlite-%{V_stable} sqlite-%{V_beta}; do
+ ( cd $dir
+ CC="%{l_cc}"
+ export CC
+ CPPFLAGS="%{l_cppflags}"
+ export CPPFLAGS
+ CFLAGS="%{l_cflags -O}"
+ export CFLAGS
+ LDFLAGS="%{l_ldflags}"
+ export LDFLAGS
+ LIBS=""
+ export LIBS
%if "%{with_assert}" == "no"
- CFLAGS="$CFLAGS -DNDEBUG=1"
+ CFLAGS="$CFLAGS -DNDEBUG=1"
%endif
%if "%{with_readline}" == "yes"
- config_TARGET_READLINE_INC="%{l_cppflags readline}"
- export config_TARGET_READLINE_INC
- config_TARGET_READLINE_LIBS="%{l_ldflags} -lreadline -ltermcap"
- export config_TARGET_READLINE_LIBS
+ config_TARGET_READLINE_INC="%{l_cppflags readline}"
+ export config_TARGET_READLINE_INC
+ config_TARGET_READLINE_LIBS="%{l_ldflags} -lreadline -ltermcap"
+ export config_TARGET_READLINE_LIBS
%endif
- ./configure \
- --prefix=%{l_prefix} \
+ ./configure \
+ --prefix=%{l_prefix} \
%if "%{with_utf8}" == "yes"
- --enable-utf8 \
+ --enable-utf8 \
%endif
- --disable-shared
- %{l_make} %{l_mflags -O}
+ --disable-shared
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
+ done
%install
rm -rf $RPM_BUILD_ROOT
@@ -118,10 +139,20 @@
$RPM_BUILD_ROOT%{l_prefix}/lib \
$RPM_BUILD_ROOT%{l_prefix}/include \
$RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix}
- %{l_shtool} install -c -m 644 \
- sqlite.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ ( cd sqlite-%{V_beta}
+ %{l_make} %{l_mflags} install \
+ prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_shtool} install -c -m 644 \
+ sqlite.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/sqlite3.1
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/sqlite.pc \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/sqlite3.pc
+ ) || exit $?
+ ( cd sqlite-%{V_stable}
+ %{l_make} %{l_mflags} install \
+ prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_shtool} install -c -m 644 \
+ sqlite.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/sqlite.1
+ ) || exit $?
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
