OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Sep-2005 20:34:20
Branch: HEAD Handle: 2005092119342000
Added files:
openpkg-src/sqlite sqlite.patch.v2
Modified files:
openpkg-src/sqlite sqlite.patch sqlite.spec
Removed files:
openpkg-src/sqlite sqlite.patch.v3
Log:
switch from v3 to v2 as the primary version of the package altough v2
is still by default provided, too (as lots of packages still require
it)
Summary:
Revision Changes Path
1.7 +21 -3 openpkg-src/sqlite/sqlite.patch
1.1 +15 -0 openpkg-src/sqlite/sqlite.patch.v2
1.8 +0 -33 openpkg-src/sqlite/sqlite.patch.v3
1.97 +30 -33 openpkg-src/sqlite/sqlite.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 sqlite.patch
--- openpkg-src/sqlite/sqlite.patch 15 Feb 2005 18:00:50 -0000 1.6
+++ openpkg-src/sqlite/sqlite.patch 21 Sep 2005 18:34:20 -0000 1.7
@@ -1,15 +1,33 @@
Index: configure
--- configure.orig 2004-06-03 13:36:27.000000000 +0200
+++ configure 2004-06-03 13:39:37.000000000 +0200
-@@ -20447,7 +20447,10 @@
+@@ -20224,6 +20224,10 @@
TARGET_HAVE_READLINE=0
fi
--
+if [ "$ac_cv_lib_readline_readline" = "no" ]
+then
+ TARGET_HAVE_READLINE=0
+fi
+
#########
- # Figure out whether or not we have a "usleep()" function.
+Index: src/os_unix.c
+--- src/os_unix.c.orig 2005-09-17 18:34:55 +0200
++++ src/os_unix.c 2005-09-18 20:33:51 +0200
+@@ -829,11 +829,15 @@
+ if( rc ) rc = fsync(fd);
+
+ #else
++#if !defined(__FreeBSD__)
+ if( dataOnly ){
+ rc = fdatasync(fd);
+ }else{
++#endif
+ rc = fsync(fd);
++#if !defined(__FreeBSD__)
+ }
++#endif
+ #endif /* defined(F_FULLFSYNC) */
+ #endif /* defined(SQLITE_NO_SYNC) */
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch.v2
============================================================================
$ cvs diff -u -r0 -r1.1 sqlite.patch.v2
--- /dev/null 2005-09-21 20:34:14 +0200
+++ sqlite.patch.v2 2005-09-21 20:34:20 +0200
@@ -0,0 +1,15 @@
+Index: configure
+--- configure.orig 2004-06-03 13:36:27.000000000 +0200
++++ configure 2004-06-03 13:39:37.000000000 +0200
+@@ -20447,7 +20447,10 @@
+ TARGET_HAVE_READLINE=0
+ fi
+
+-
++if [ "$ac_cv_lib_readline_readline" = "no" ]
++then
++ TARGET_HAVE_READLINE=0
++fi
+
+ #########
+ # Figure out whether or not we have a "usleep()" function.
@@ .
rm -f openpkg-src/sqlite/sqlite.patch.v3 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch.v3
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.spec
============================================================================
$ cvs diff -u -r1.96 -r1.97 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec 21 Sep 2005 18:22:44 -0000 1.96
+++ openpkg-src/sqlite/sqlite.spec 21 Sep 2005 18:34:20 -0000 1.97
@@ -23,8 +23,8 @@
##
# package version
-%define V_v2 2.8.16
%define V_v3 3.2.6
+%define V_v2 2.8.16
# package information
Name: sqlite
@@ -36,33 +36,30 @@
Class: BASE
Group: Database
License: PD
-Version: %{V_v2}
+Version: %{V_v3}
Release: 20050921
# package options
-%option with_v3 yes
+%option with_v2 yes
%option with_utf8 no
%option with_assert no
%option with_readline no
# list of sources
-Source0: http://www.sqlite.org/sqlite-%{V_v2}.tar.gz
-Source1: http://www.sqlite.org/sqlite-%{V_v3}.tar.gz
+Source0: http://www.sqlite.org/sqlite-%{V_v3}.tar.gz
+Source1: http://www.sqlite.org/sqlite-%{V_v2}.tar.gz
Patch0: sqlite.patch
-Patch1: sqlite.patch.v3
+Patch1: sqlite.patch.v2
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make
+BuildPreReq: OpenPKG, openpkg >= 20040130, make, gawk
PreReq: OpenPKG, openpkg >= 20040130
%if "%{with_readline}" == "yes"
BuildPreReq: readline, pkgconfig
PreReq: readline
%endif
-%if "%{with_v3}" == "yes"
-BuildPreReq: gawk
-%endif
AutoReq: no
AutoReqProv: no
@@ -77,32 +74,32 @@
the server. The SQLite library reads and writes directly to and from
the database files on disk.
- This package contains both SQLite 2 (%{V_v2}) and optionally the
- forthcoming SQLite 3 (%{V_v3}). Notice that the two are API and
- database format incompatible but can be used at the same time.
+ This package contains both SQLite 3 (%{V_v3}) and optionally the old
+ SQLite 2 (%{V_v2}). Notice that the two are API and database format
+ incompatible but can be used at the same time.
%track
prog sqlite = {
- version = %{V_v2}
- url = http://www.sqlite.org/download.html
- regex = sqlite-(2\.\d+\.\d+)\.tar\.gz
- }
- prog sqlite:v3 = {
version = %{V_v3}
url = http://www.sqlite.org/download.html
regex = sqlite-(\d+\.\d+\.\d+)\.tar\.gz
}
+ prog sqlite:v2 = {
+ version = %{V_v2}
+ url = http://www.sqlite.org/download.html
+ regex = sqlite-(2\.\d+\.\d+)\.tar\.gz
+ }
%prep
%setup -q -c
- %patch -p0 -d sqlite-%{V_v2} -P 0
-%if "%{with_v3}" == "yes"
%setup -q -D -T -a 1
- %patch -p0 -d sqlite-%{V_v3} -P 1
-%endif
- for v in %{V_v2} \
-%if "%{with_v3}" == "yes"
- %{V_v3} \
+ %patch -p0 -d sqlite-%{V_v3} -P 0
+%if "%{with_v2}" == "yes"
+ %patch -p0 -d sqlite-%{V_v2} -P 1
+%endif
+ for v in %{V_v3} \
+%if "%{with_v2}" == "yes"
+ %{V_v2} \
%endif
; do
%{l_shtool} subst \
@@ -111,9 +108,9 @@
done
%build
- for v in %{V_v2} \
-%if "%{with_v3}" == "yes"
- %{V_v3} \
+ for v in %{V_v3} \
+%if "%{with_v2}" == "yes"
+ %{V_v2} \
%endif
; do
( cd sqlite-$v
@@ -147,10 +144,10 @@
-e 's;-DNDEBUG;;' \
Makefile
%endif
-%if "%{with_v3}" == "yes"
- %{l_make} %{l_mflags -O} LIBPTHREAD=""
-%else
+%if "%{with_v2}" == "yes"
%{l_make} %{l_mflags -O}
+%else
+ %{l_make} %{l_mflags -O} LIBPTHREAD=""
%endif
) || exit $?
done
@@ -162,20 +159,20 @@
$RPM_BUILD_ROOT%{l_prefix}/lib \
$RPM_BUILD_ROOT%{l_prefix}/include \
$RPM_BUILD_ROOT%{l_prefix}/man/man1
-%if "%{with_v3}" == "yes"
( cd sqlite-%{V_v3}
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix}
%{l_shtool} install -c -m 644 \
sqlite3.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/sqlite3.1
) || exit $?
-%endif
+%if "%{with_v2}" == "yes"
( cd sqlite-%{V_v2}
%{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 $?
+%endif
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 openpkg-cvs@openpkg.org
