rebase to upstream version 3.43.0

This commit is contained in:
Zuzana Miklankova 2023-08-31 10:29:50 +02:00
parent 18662c2ae4
commit d682422d36
No known key found for this signature in database
GPG Key ID: 46A18EF4D17103A0
2 changed files with 9 additions and 8 deletions

View File

@ -1,13 +1,11 @@
diff --git a/tool/lemon.c b/tool/lemon.c
index 54c8946..ac14a06 100644
--- a/tool/lemon.c --- a/tool/lemon.c
+++ b/tool/lemon.c +++ b/tool/lemon.c
@@ -3668,6 +3668,8 @@ PRIVATE FILE *tplt_open(struct lemon *lemp) @@ -3686,6 +3686,8 @@
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{
toFree = tpltname = pathsearch(lemp->argv0,templatename,0); toFree = tpltname = pathsearch(lemp->argv[0],templatename,0);
} }

View File

@ -4,15 +4,15 @@
%bcond_with static %bcond_with static
%bcond_without check %bcond_without check
%define realver 3420000 %define realver 3430000
%define docver 3420000 %define docver 3430000
%define rpmver 3.42.0 %define rpmver 3.43.0
%define year 2023 %define year 2023
Summary: Library that implements an embeddable SQL database engine Summary: Library that implements an embeddable SQL database engine
Name: sqlite Name: sqlite
Version: %{rpmver} Version: %{rpmver}
Release: 7%{?dist} Release: 1%{?dist}
License: blessing License: blessing
URL: http://www.sqlite.org/ URL: http://www.sqlite.org/
@ -255,6 +255,9 @@ make test
%endif %endif
%changelog %changelog
* Mon Aug 28 2023 Zuzana Miklankova <zmiklank@redhat.com> - 3.43.0-1
- Updated to version 3.43.0 (https://sqlite.org/releaselog/3_43_0.html)
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.42.0-7 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.42.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild