Compare commits

...

5 Commits
rawhide ... f32

Author SHA1 Message Date
Ondrej Dubaj
d18e8e8ae9 Updated to version 3.34.0 2020-12-02 08:34:20 +01:00
Ondrej Dubaj
6604a23556 Enabled fts3conf.test on s390x and ppc64 architectures 2020-12-01 09:38:55 +01:00
Sheng Mao
e3c4daeada Enable FTS4 extensions (rhbz#1887106) 2020-10-11 10:24:22 +02:00
Michal Schorm
d8566cc844 Remove redundant macros
%{?_smp_mflags} macro is a part of %make_build macro
2020-08-19 08:54:04 +02:00
Ondrej Dubaj
fb92fc716e Rebased to version 3.33.0
Resolves: #1868945
2020-08-16 17:59:24 +02:00
3 changed files with 28 additions and 28 deletions

View File

@ -1,3 +1,3 @@
SHA512 (sqlite-doc-3320300.zip) = af9dca970b4c03c058d7d1cd55a3d11fa4b112dccac942b8660d82a7e9ba2956963fcb429eedfdc85915637c102e1f904ace98c8e0455c4120422bbd9f2f3cd0 SHA512 (sqlite-src-3340000.zip) = 520fbca59da02452e2861a140bde891aedfc8254eafaa6894e8d845369d60d6a921595a411efb2611c0f7b0cadd69a713dcdaaeaad1e4254e9fd9a6efde07f91
SHA512 (sqlite-src-3320300.zip) = 7e027c7163a760fb9b6dbfd2e4ccffb39d4972280583fb0d7f8390017101dfed3b12a36653b3130a548ae4d04c6abb11c0a1921b6f09c54c6ae1e72fbdcb2fd4 SHA512 (sqlite-doc-3340000.zip) = 1bdf20030e656ec4ce38a264c8ef7a95c9f2731cd7d756a44b35b6c68827e8aba92018007139ee09d1c27b34bcd72bff1a201dc3f30aa13e96120af5d58e835e
SHA512 (sqlite-autoconf-3320300.tar.gz) = add0ef47c059be0a75add7ab4fe52b2fbd4060cacbf1cbb93f1b4007cdeb8fc92256b1aadc224c4839e733fb868e56d9d73dd33c56a6f66180d1ff001d8d275e SHA512 (sqlite-autoconf-3340000.tar.gz) = 75a1a2d86ab41354941b8574e780b1eae09c3c01f8da4b08f606b96962b80550f739ec7e9b1ceb07bba1cedced6d18a1408e4c10ff645eb1829d368ad308cf2f

View File

@ -1,21 +1,13 @@
diff -up sqlite-3.6.23/tool/lemon.c.system-template sqlite-3.6.23/tool/lemon.c diff --git a/tool/lemon.c b/tool/lemon.c
--- sqlite-3.6.23/tool/lemon.c.system-template 2010-03-10 16:40:35.000000000 +0200 index 54c8946..ac14a06 100644
+++ sqlite-3.6.23/tool/lemon.c 2010-03-10 16:40:39.000000000 +0200 --- a/tool/lemon.c
@@ -3363,6 +3363,8 @@ PRIVATE FILE *tplt_open(struct lemon *le +++ b/tool/lemon.c
@@ -3668,6 +3668,8 @@ PRIVATE FILE *tplt_open(struct lemon *lemp)
tpltname = buf; tpltname = buf;
}else if( access(templatename,004)==0 ){ }else if( access(templatename,004)==0 ){
tpltname = templatename; tpltname = templatename;
+ }else if( access("/usr/share/lemon/lempar.c", R_OK)==0){ + }else if( access("/usr/share/lemon/lempar.c", R_OK)==0){
+ tpltname = "/usr/share/lemon/lempar.c"; + tpltname = "/usr/share/lemon/lempar.c";
}else{ }else{
tpltname = pathsearch(lemp->argv0,templatename,0); toFree = tpltname = pathsearch(lemp->argv0,templatename,0);
}
@@ -3374,7 +3376,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;
} }

View File

@ -4,9 +4,9 @@
%bcond_with static %bcond_with static
%bcond_without check %bcond_without check
%define realver 3320300 %define realver 3340000
%define docver 3320300 %define docver 3340000
%define rpmver 3.32.3 %define rpmver 3.34.0
%define year 2020 %define year 2020
Summary: Library that implements an embeddable SQL database engine Summary: Library that implements an embeddable SQL database engine
@ -146,12 +146,14 @@ autoconf # Rerun with new autoconf to add support for aarm64
%build %build
export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \ export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
-DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 \ -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=1 \
-DSQLITE_ENABLE_RTREE=1 -DSQLITE_SECURE_DELETE=1 \ -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SECURE_DELETE=1 \
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
-DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_JSON1=1 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_JSON1=1 \
-DSQLITE_ENABLE_FTS4=1 \
-Wall -fno-strict-aliasing" -Wall -fno-strict-aliasing"
%configure %{!?with_tcl:--disable-tcl} \ %configure %{!?with_tcl:--disable-tcl} \
--enable-fts4 \
--enable-fts5 \ --enable-fts5 \
--enable-threadsafe \ --enable-threadsafe \
--enable-threads-override-locks \ --enable-threads-override-locks \
@ -162,17 +164,17 @@ export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} %make_build
# Build sqlite3_analyzer # Build sqlite3_analyzer
# depends on tcl # depends on tcl
%if %{with tcl} %if %{with tcl}
make %{?_smp_mflags} sqlite3_analyzer %make_build sqlite3_analyzer
%endif %endif
# Build sqldiff # Build sqldiff
%if %{with tcl} %if %{with tcl}
make %{?_smp_mflags} sqldiff %make_build sqldiff
%endif %endif
%install %install
@ -210,10 +212,6 @@ export MALLOC_CHECK_=3
rm test/csv01.test rm test/csv01.test
%endif %endif
%ifarch s390x ppc64
rm test/fts3conf.test
%endif
make test make test
%endif #with check %endif #with check
@ -257,6 +255,16 @@ make test
%endif %endif
%changelog %changelog
* Wed Dec 02 2020 Ondrej Dubaj <odubaj@redhat.com> - 3.34.0-1
- Updated to version 3.34.0 (https://sqlite.org/releaselog/3_34_0.html)
- Enabled fts3conf.test on s390x and ppc64 architectures
* Fri Oct 09 2020 Sheng Mao <shngmao@gmail.com> - 3.33.0-2
- Enable FTS4 extensions (rhbz#1887106)
* Fri Aug 14 2020 Ondrej Dubaj <odubaj@redhat.com> - 3.33.0-1
- Updated to version 3.33.0 (https://sqlite.org/releaselog/3_33_0.html)
* Fri Jun 19 2020 Ondrej Dubaj <odubaj@redhat.com> - 3.32.3-1 * Fri Jun 19 2020 Ondrej Dubaj <odubaj@redhat.com> - 3.32.3-1
- Updated to version 3.32.3 (https://sqlite.org/releaselog/3_32_3.html) - Updated to version 3.32.3 (https://sqlite.org/releaselog/3_32_3.html)