From a97b4cb4e925efc32f5d067a2adddb21eb1ec744 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Wed, 22 Dec 2010 23:00:52 +0000 Subject: [PATCH] upgrading package: sqlite 3.7.3 -> 3.7.4 --- sqlite/sqlite.patch | 9 --------- sqlite/sqlite.spec | 17 +++++++++-------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/sqlite/sqlite.patch b/sqlite/sqlite.patch index e4dc27d339..bb368a05a2 100644 --- a/sqlite/sqlite.patch +++ b/sqlite/sqlite.patch @@ -1,15 +1,6 @@ Index: Makefile.in --- Makefile.in.orig 2010-07-18 21:30:41.000000000 +0200 +++ Makefile.in 2010-07-22 21:25:22.000000000 +0200 -@@ -181,7 +181,7 @@ - table.lo tokenize.lo trigger.lo \ - update.lo util.lo vacuum.lo \ - vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbetrace.lo \ -- wal.lo walker.lo where.lo utf.o vtab.lo -+ wal.lo walker.lo where.lo utf.lo vtab.lo - - # Object files for the amalgamation. - # @@ -191,6 +191,21 @@ # LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION)) diff --git a/sqlite/sqlite.spec b/sqlite/sqlite.spec index 8206bb901e..6324beb319 100644 --- a/sqlite/sqlite.spec +++ b/sqlite/sqlite.spec @@ -22,7 +22,8 @@ ## # package version -%define V_sqlite 3.7.3 +%define V_sqlite 3.7.4 +%define V_dist 3070400 %define V_odbc 0.87 %define V_jdbc 20100727 @@ -37,7 +38,7 @@ Class: BASE Group: Database License: PD Version: %{V_sqlite} -Release: 20101009 +Release: 20101223 # package options %option with_debug no @@ -50,7 +51,7 @@ Release: 20101009 %option with_regexp yes # list of sources -Source0: http://www.sqlite.org/sqlite-%{V_sqlite}.tar.gz +Source0: http://www.sqlite.org/sqlite-src-%{V_dist}.zip Source1: http://www.ch-werner.de/sqliteodbc/sqliteodbc-%{V_odbc}.tar.gz Source2: http://www.ch-werner.de/javasqlite/javasqlite-%{V_jdbc}.tar.gz Patch0: sqlite.patch @@ -85,9 +86,9 @@ PreReq: java, JAVA-JDK %track prog sqlite = { - version = %{V_sqlite} + version = %{V_dist} url = http://www.sqlite.org/download.html - regex = sqlite-(\d+\.\d+\.\d+(?:\.\d+)?)\.tar\.gz + regex = sqlite-src-(\d+)\.zip } prog sqlite:odbc = { version = %{V_odbc} @@ -101,14 +102,14 @@ PreReq: java, JAVA-JDK } %prep - %setup -q + %setup -q -n sqlite-src-%{V_dist} %patch -p0 -P 0 %if "%{with_odbc}" == "yes" - %setup -q -D -T -a 1 + %setup -q -n sqlite-src-%{V_dist} -D -T -a 1 %patch -p0 -d sqliteodbc-%{V_odbc} -P 1 %endif %if "%{with_jdbc}" == "yes" - %setup -q -D -T -a 2 + %setup -q -n sqlite-src-%{V_dist} -D -T -a 2 %endif %build