diff --git a/.gitignore b/.gitignore index a893e46..6fe3f93 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ sqlite-3.6.17.tar.gz sqlite-3.6.20.tar.gz sqlite-3.6.22.tar.gz /sqlite-3.7.3.tar.gz +/sqlite-src-3070500.zip diff --git a/mingw32-sqlite.spec b/mingw32-sqlite.spec index 68581c1..663454f 100644 --- a/mingw32-sqlite.spec +++ b/mingw32-sqlite.spec @@ -5,27 +5,34 @@ %global __find_provides %{_mingw32_findprovides} %define __debug_install_post %{_mingw32_debug_install_post} +%global name1 sqlite + +%global realver 3070500 +%global rpmver %(echo %{realver}|sed -e "s/00//g" -e "s/0/./g") + # bcond default logic is nicely backwards... %bcond_with tcl %global tclversion 8.5 -Name: mingw32-sqlite -Version: 3.7.3 -Release: 2%{?dist} +Name: mingw32-%{name1} +Version: %{rpmver} +Release: 1%{?dist} Summary: MinGW Windows port of sqlite embeddable SQL database engine License: Public Domain Group: Applications/Databases URL: http://www.sqlite.org/ -Source0: http://www.sqlite.org/sqlite-%{version}.tar.gz +Source0: http://www.sqlite.org/%{name1}-src-%{realver}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Patches from Fedora native package. Patch1: sqlite-3.6.12-libdl.patch +Patch2: sqlite-3.6.23-lemon-system-template.patch +Patch3: sqlite-3.7.4-wal2-nodirsync.patch # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian -Patch2: sqlite-3.7.3-lemon-snprintf.patch +Patch4: sqlite-3.7.3-lemon-snprintf.patch # Patches for MinGW port. Patch1000: mingw32-sqlite-3.6.12-no-undefined.patch @@ -67,9 +74,11 @@ for Windows. %prep -%setup -q -n sqlite-%{version} +%setup -q -n %{name1}-src-%{realver} %patch1 -p1 -b .libdl -%patch2 -p1 -b .lemon-sprintf +%patch2 -p1 -b .lemon +%patch3 -p1 -b .wal2 +%patch4 -p1 -b .lemon-sprintf %patch1000 -p1 # Ships with an old/broken version of libtool which cannot create @@ -140,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Feb 13 2011 Thomas Sailer - 3.7.5-1 +- update to 3.7.5 + * Tue Feb 08 2011 Fedora Release Engineering - 3.7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index a3301bf..e2fe071 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5437978aae90350cf984993091e0d695 sqlite-3.7.3.tar.gz +d61d784997d42cd0d92bac7994094c56 sqlite-src-3070500.zip diff --git a/sqlite-3.6.23-lemon-system-template.patch b/sqlite-3.6.23-lemon-system-template.patch new file mode 100644 index 0000000..16db588 --- /dev/null +++ b/sqlite-3.6.23-lemon-system-template.patch @@ -0,0 +1,21 @@ +diff -up sqlite-3.6.23/tool/lemon.c.system-template sqlite-3.6.23/tool/lemon.c +--- sqlite-3.6.23/tool/lemon.c.system-template 2010-03-10 16:40:35.000000000 +0200 ++++ sqlite-3.6.23/tool/lemon.c 2010-03-10 16:40:39.000000000 +0200 +@@ -3106,6 +3106,8 @@ PRIVATE FILE *tplt_open(struct lemon *le + tpltname = buf; + }else if( access(templatename,004)==0 ){ + tpltname = templatename; ++ }else if( access("/usr/share/lemon/lempar.c", R_OK)==0){ ++ tpltname = "/usr/share/lemon/lempar.c"; + }else{ + tpltname = pathsearch(lemp->argv0,templatename,0); + } +@@ -3117,7 +3119,7 @@ PRIVATE FILE *tplt_open(struct lemon *le + } + in = fopen(tpltname,"rb"); + if( in==0 ){ +- fprintf(stderr,"Can't open the template file \"%s\".\n",templatename); ++ fprintf(stderr,"Can't open the template file \"%s\".\n",tpltname); + lemp->errorcnt++; + return 0; + } diff --git a/sqlite-3.7.3-lemon-snprintf.patch b/sqlite-3.7.3-lemon-snprintf.patch index 98e48e3..2cc009f 100644 --- a/sqlite-3.7.3-lemon-snprintf.patch +++ b/sqlite-3.7.3-lemon-snprintf.patch @@ -1,7 +1,7 @@ diff -up sqlite-3.7.3/tool/lemon.c.lemparpath sqlite-3.7.3/tool/lemon.c --- sqlite-3.7.3/tool/lemon.c.lemparpath 2008-12-05 20:37:49.000000000 +0200 +++ sqlite-3.7.3/tool/lemon.c 2008-12-05 20:44:08.000000000 +0200 -@@ -2363,7 +2363,7 @@ +@@ -2369,7 +2369,7 @@ for(z=psp->filename, nBack=0; *z; z++){ if( *z=='\\' ) nBack++; } @@ -10,7 +10,7 @@ diff -up sqlite-3.7.3/tool/lemon.c.lemparpath sqlite-3.7.3/tool/lemon.c nLine = lemonStrlen(zLine); n += nLine + lemonStrlen(psp->filename) + nBack; } -@@ -2947,7 +2947,7 @@ +@@ -2953,7 +2953,7 @@ while( cfp ){ char buf[20]; if( cfp->dot==cfp->rp->nrhs ){ @@ -19,7 +19,7 @@ diff -up sqlite-3.7.3/tool/lemon.c.lemparpath sqlite-3.7.3/tool/lemon.c fprintf(fp," %5s ",buf); }else{ fprintf(fp," "); -@@ -3118,14 +3118,16 @@ +@@ -3124,9 +3124,9 @@ cp = strrchr(lemp->filename,'.'); if( cp ){ @@ -31,23 +31,7 @@ diff -up sqlite-3.7.3/tool/lemon.c.lemparpath sqlite-3.7.3/tool/lemon.c } if( access(buf,004)==0 ){ tpltname = buf; - }else if( access(templatename,004)==0 ){ - tpltname = templatename; -+ }else if( access("/usr/share/lemon/lempar.c",004)==0 ){ -+ tpltname = "/usr/share/lemon/lempar.c"; - }else{ - tpltname = pathsearch(lemp->argv0,templatename,0); - } -@@ -3137,7 +3139,7 @@ - } - in = fopen(tpltname,"rb"); - if( in==0 ){ -- fprintf(stderr,"Can't open the template file \"%s\".\n",templatename); -+ fprintf(stderr,"Can't open the template file \"%s\".\n",tpltname); - lemp->errorcnt++; - return 0; - } -@@ -3271,7 +3273,7 @@ +@@ -3279,7 +3279,7 @@ while( n-- > 0 ){ c = *(zText++); if( c=='%' && n>0 && zText[0]=='d' ){ @@ -56,7 +40,7 @@ diff -up sqlite-3.7.3/tool/lemon.c.lemparpath sqlite-3.7.3/tool/lemon.c p1 = p2; strcpy(&z[used], zInt); used += lemonStrlen(&z[used]); -@@ -3883,7 +3885,7 @@ +@@ -3891,7 +3891,7 @@ /* Generate a table containing the symbolic name of every symbol */ for(i=0; insymbol; i++){ @@ -65,7 +49,7 @@ diff -up sqlite-3.7.3/tool/lemon.c.lemparpath sqlite-3.7.3/tool/lemon.c fprintf(out," %-15s",line); if( (i&3)==3 ){ fprintf(out,"\n"); lineno++; } } -@@ -4049,7 +4051,7 @@ +@@ -4057,7 +4057,7 @@ in = file_open(lemp,".h","rb"); if( in ){ for(i=1; interminal && fgets(line,LINESIZE,in); i++){ diff --git a/sqlite-3.7.4-wal2-nodirsync.patch b/sqlite-3.7.4-wal2-nodirsync.patch new file mode 100644 index 0000000..00480d8 --- /dev/null +++ b/sqlite-3.7.4-wal2-nodirsync.patch @@ -0,0 +1,16 @@ +diff -up sqlite-src-3070400/test/wal2.test.nodirsync sqlite-src-3070400/test/wal2.test +--- sqlite-src-3070400/test/wal2.test.nodirsync 2010-12-09 13:49:43.000000000 +0200 ++++ sqlite-src-3070400/test/wal2.test 2010-12-09 13:57:57.000000000 +0200 +@@ -1160,9 +1160,9 @@ if {$::tcl_platform(platform) == "unix"} + # Test that "PRAGMA checkpoint_fullsync" appears to be working. + # + foreach {tn sql reslist} { +- 1 { } {8 0 3 0 5 0} +- 2 { PRAGMA checkpoint_fullfsync = 1 } {8 4 3 2 5 2} +- 3 { PRAGMA checkpoint_fullfsync = 0 } {8 0 3 0 5 0} ++ 1 { } {7 0 3 0 5 0} ++ 2 { PRAGMA checkpoint_fullfsync = 1 } {7 4 3 2 5 2} ++ 3 { PRAGMA checkpoint_fullfsync = 0 } {7 0 3 0 5 0} + } { + faultsim_delete_and_reopen +