diff --git a/.gitignore b/.gitignore index 2645a98..f673506 100644 --- a/.gitignore +++ b/.gitignore @@ -1,89 +1,3 @@ -/sqlite_docs_3_7_3.zip -/sqlite-3.7.3.tar.gz -/sqlite-doc-3070400.zip -/sqlite-src-3070400.zip -/sqlite-src-3070500.zip -/sqlite-doc-3070500.zip -/sqlite-src-3070602.zip -/sqlite-doc-3070600.zip -/sqlite-src-3070603.zip -/sqlite-src-3070701.zip -/sqlite-doc-3070701.zip -/sqlite-src-3070800.zip -/sqlite-doc-3070800.zip -/sqlite-src-3070900.zip -/sqlite-doc-3070900.zip -/sqlite-src-3071000.zip -/sqlite-doc-3071000.zip -/sqlite-src-3071100.zip -/sqlite-doc-3071100.zip -/sqlite-src-3071300.zip -/sqlite-doc-3071300.zip -/sqlite-doc-3071400.zip -/sqlite-src-3071400.zip -/sqlite-src-3071401.zip -/sqlite-src-3071500.zip -/sqlite-doc-3071500.zip -/sqlite-src-3071502.zip -/sqlite-doc-3071502.zip -/sqlite-src-3071600.zip -/sqlite-doc-3071600.zip -/sqlite-doc-3071601.zip -/sqlite-src-3071601.zip -/sqlite-doc-3071602.zip -/sqlite-src-3071602.zip -/sqlite-src-3071700.zip -/sqlite-doc-3071700.zip -/sqlite-src-3080002.zip -/sqlite-doc-3080002.zip -/sqlite-src-3080100.zip -/sqlite-doc-3080100.zip -/sqlite-src-3080200.zip -/sqlite-doc-3080200.zip -/sqlite-src-3080300.zip -/sqlite-doc-3080300.zip -/sqlite-src-3080400.zip -/sqlite-doc-3080400.zip -/sqlite-src-3080402.zip -/sqlite-doc-3080402.zip -/sqlite-src-3080403.zip -/sqlite-doc-3080403.zip -/sqlite-src-3080500.zip -/sqlite-doc-3080500.zip -/sqlite-src-3080600.zip -/sqlite-doc-3080600.zip -/sqlite-src-3080700.zip -/sqlite-doc-3080700.zip -/sqlite-src-3080702.zip -/sqlite-doc-3080702.zip -/sqlite-src-3080704.zip -/sqlite-doc-3080704.zip -/sqlite-src-3080800.zip -/sqlite-doc-3080800.zip -/sqlite-src-3080803.zip -/sqlite-doc-3080803.zip -/sqlite-src-3080900.zip -/sqlite-doc-3080900.zip -/sqlite-src-3081001.zip -/sqlite-doc-3081001.zip -/sqlite-src-3081002.zip -/sqlite-doc-3081002.zip -/sqlite-src-3081100.zip -/sqlite-doc-3081100.zip -/sqlite-src-3081101.zip -/sqlite-doc-3081101.zip -/sqlite-src-3090000.zip -/sqlite-doc-3090000.zip -/sqlite-autoconf-3090000.tar.gz -/sqlite-src-3090200.zip -/sqlite-doc-3090200.zip -/sqlite-autoconf-3090200.tar.gz -/sqlite-src-3100000.zip -/sqlite-doc-3100000.zip -/sqlite-autoconf-3100000.tar.gz -/sqlite-src-3100200.zip -/sqlite-doc-3100200.zip -/sqlite-autoconf-3100200.tar.gz -/sqlite-src-3110000.zip -/sqlite-doc-3110000.zip -/sqlite-autoconf-3110000.tar.gz +/sqlite-*.zip +/sqlite-autoconf-*.tar.gz +/sqlite-*/ diff --git a/sources b/sources index 7fb4db5..8f7902e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -8e915b6d0b75e792d680ad77055f8b20 sqlite-src-3110000.zip -4e881ce616b44dbb1f2f7fb554bbe0be sqlite-doc-3110000.zip -a6cdc3e0a6e5087d620037ae0c48720d sqlite-autoconf-3110000.tar.gz +ad51fce1593191281c6eca810e0cc629 sqlite-src-3120200.zip +8d4572295e17612b8f2e17ef60707ba4 sqlite-doc-3120200.zip +c552a133aca1ce1d647163d9e43bbcb1 sqlite-autoconf-3120200.tar.gz diff --git a/sqlite-3.12.2-no-malloc-usable-size.patch b/sqlite-3.12.2-no-malloc-usable-size.patch new file mode 100644 index 0000000..5f22238 --- /dev/null +++ b/sqlite-3.12.2-no-malloc-usable-size.patch @@ -0,0 +1,24 @@ +diff -up sqlite-src-3120200/configure.ac.malloc_usable_size sqlite-src-3120200/configure.ac +--- sqlite-src-3120200/configure.ac.malloc_usable_size 2016-04-25 09:46:48.134690570 +0200 ++++ sqlite-src-3120200/configure.ac 2016-04-25 09:48:41.622637181 +0200 +@@ -108,7 +108,7 @@ AC_CHECK_HEADERS([sys/types.h stdlib.h s + ######### + # Figure out whether or not we have these functions + # +-AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64]) ++AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s strchrnul usleep utime pread pread64 pwrite pwrite64]) + + ######### + # By default, we use the amalgamation (this may be changed below...) +diff -up sqlite-src-3120200/configure.malloc_usable_size sqlite-src-3120200/configure +--- sqlite-src-3120200/configure.malloc_usable_size 2016-04-25 09:47:12.594679063 +0200 ++++ sqlite-src-3120200/configure 2016-04-25 09:49:28.684615042 +0200 +@@ -10273,7 +10273,7 @@ done + ######### + # Figure out whether or not we have these functions + # +-for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64 ++for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s strchrnul usleep utime pread pread64 pwrite pwrite64 + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/sqlite-3.7.15-no-malloc-usable-size.patch b/sqlite-3.7.15-no-malloc-usable-size.patch deleted file mode 100644 index 8386cd8..0000000 --- a/sqlite-3.7.15-no-malloc-usable-size.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up sqlite-src-3081002/configure.ac.malloc_usable_size sqlite-src-3081002/configure.ac ---- sqlite-src-3081002/configure.ac.malloc_usable_size 2015-05-29 10:11:21.154578129 +0200 -+++ sqlite-src-3081002/configure.ac 2015-05-29 10:11:35.405646670 +0200 -@@ -109,7 +109,7 @@ AC_CHECK_HEADERS([sys/types.h stdlib.h s - ######### - # Figure out whether or not we have these functions - # --AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime]) -+AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s strchrnul usleep utime]) - - ######### - # By default, we use the amalgamation (this may be changed below...) -diff -up sqlite-src-3081002/configure.malloc_usable_size sqlite-src-3081002/configure ---- sqlite-src-3081002/configure.malloc_usable_size 2015-05-29 10:11:55.285742284 +0200 -+++ sqlite-src-3081002/configure 2015-05-29 10:12:11.741821430 +0200 -@@ -10303,7 +10303,7 @@ done - ######### - # Figure out whether or not we have these functions - # --for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime -+for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s strchrnul usleep utime - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/sqlite.spec b/sqlite.spec index 6af88d0..443e423 100644 --- a/sqlite.spec +++ b/sqlite.spec @@ -3,14 +3,14 @@ %bcond_with static %bcond_without check -%define realver 3110000 -%define docver 3110000 -%define rpmver 3.11.0 +%define realver 3120200 +%define docver 3120200 +%define rpmver 3.12.2 Summary: Library that implements an embeddable SQL database engine Name: sqlite Version: %{rpmver} -Release: 3%{?dist} +Release: 1%{?dist} License: Public Domain Group: Applications/Databases URL: http://www.sqlite.org/ @@ -25,7 +25,7 @@ Patch2: sqlite-3.7.7.1-stupid-openfiles-test.patch # sqlite >= 3.7.10 is buggy if malloc_usable_size() is detected, disable it: # https://bugzilla.redhat.com/show_bug.cgi?id=801981 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665363 -Patch3: sqlite-3.7.15-no-malloc-usable-size.patch +Patch3: sqlite-3.12.2-no-malloc-usable-size.patch # Temporary workaround for failed percentile test, see patch for details Patch4: sqlite-3.8.0-percentile-test.patch # Disable test failing due to tcl regression. Details in patch file. @@ -227,6 +227,9 @@ make test %endif %changelog +* Mon Apr 25 2016 Jakub Dorňák - 3.12.2-1 +- Updated to version 3.12.2 (https://sqlite.org/releaselog/3_12_2.html) + * Wed Mar 02 2016 Jan Stanek - 3.11.0-3 - Release bump for #1312506