From 45b5562783e276ea23d8b3d8834e075d28d7a8ff Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 13 Aug 2022 15:38:36 +0200 Subject: [PATCH 1/2] Use correct wx-config file in configure --- wxsqlite3.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/wxsqlite3.spec b/wxsqlite3.spec index efc5f58..18d0a4d 100644 --- a/wxsqlite3.spec +++ b/wxsqlite3.spec @@ -1,13 +1,14 @@ # wx-config -%global wxversion %(wx-config-3.1 --release) %if 0%{?fedora} >= 37 %global wxversion %(wx-config-3.2 --release) +%else +%global wxversion %(wx-config-3.1 --release) %endif %global wxincdir %{_includedir}/wx-%{wxversion} Name: wxsqlite3 Version: 4.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ wrapper around the SQLite 3.x database License: wxWidgets @@ -90,7 +91,13 @@ chmod -x LICENCE.txt readme.md autoreconf %configure --enable-shared=yes --enable-static=no # use correct wx-config file -#sed -i -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=wx-config-3.0|g' configure +%if 0%{?fedora} >= 37 +sed -i -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=wx-config-3.2|g' configure +%else +sed -i -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=wx-config-3.1|g' configure +%endif + + %make_build # build docs @@ -130,6 +137,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Fri Aug 12 2022 Martin Gansser 4.8.2-5 +- Use correct wx-config file in configure + * Wed Aug 10 2022 Martin Gansser 4.8.2-4 - Set wxversion to 3.1 for fedora <= 36 From 9972b60bfd7a196218f18fedaf800d9db8427d2f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 17 Oct 2022 15:51:55 +0200 Subject: [PATCH 2/2] Update wxsqlite3.spec to enable encryption --- wxsqlite3.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wxsqlite3.spec b/wxsqlite3.spec index 18d0a4d..7380790 100644 --- a/wxsqlite3.spec +++ b/wxsqlite3.spec @@ -8,7 +8,7 @@ Name: wxsqlite3 Version: 4.8.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ wrapper around the SQLite 3.x database License: wxWidgets @@ -89,7 +89,9 @@ chmod -x LICENCE.txt readme.md %build #autoreconf --install --force autoreconf -%configure --enable-shared=yes --enable-static=no +%configure --enable-shared=yes --enable-static=no --enable-codec=chacha20 \ + --enable-codec=sqlcipher --enable-codec=rc4 --enable-codec=aes256 \ + --enable-codec=aes128 # use correct wx-config file %if 0%{?fedora} >= 37 sed -i -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=wx-config-3.2|g' configure @@ -137,6 +139,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Mon Oct 17 2022 Martin Gansser 4.8.2-6 +- Update wxsqlite3.spec to enable encryption + * Fri Aug 12 2022 Martin Gansser 4.8.2-5 - Use correct wx-config file in configure