From 68a4f5c557cddbc811f5ceafe4bc55f2a3dd5eaa Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Aug 2022 11:18:18 +0200 Subject: [PATCH 1/5] Update to 4.8.2 --- .gitignore | 1 + sources | 2 +- wxsqlite3.spec | 20 ++++++++++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6e76147..a045222 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /wxsqlite3-6feb9d1.tar.gz /wxsqlite3-91de286.tar.gz /wxsqlite3-4.5.1.tar.gz +/wxsqlite3-4.8.2.tar.gz diff --git a/sources b/sources index 380b8fb..e05d1c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxsqlite3-4.5.1.tar.gz) = e9a5c888ca61a5b3f1bf1247b44dab938646eda7b215ec7a8f2f993d26b1785d40343abfb66d9e99aad39a8028ba64ce54d29fb76ecdd0550820b6c1295438bb +SHA512 (wxsqlite3-4.8.2.tar.gz) = 828ecbfd9f3d3babb464f96f129f072f04f4113b70b25cc1ede2a08da1c7ba675fc4ff9e565d6361a3935e5199a0958c3acec317d44b5d19a3ec928b9141c887 diff --git a/wxsqlite3.spec b/wxsqlite3.spec index db3563c..7aadf70 100644 --- a/wxsqlite3.spec +++ b/wxsqlite3.spec @@ -2,8 +2,8 @@ %global wxincdir %{_includedir}/wx-%{wxversion} Name: wxsqlite3 -Version: 4.5.1 -Release: 4%{?dist} +Version: 4.8.2 +Release: 1%{?dist} Summary: C++ wrapper around the SQLite 3.x database License: wxWidgets @@ -14,7 +14,7 @@ Source0: https://github.com/utelle/wxsqlite3/archive/v%{version}.tar.gz#/ BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK-devel BuildRequires: sqlite-devel BuildRequires: doxygen BuildRequires: dos2unix @@ -44,7 +44,7 @@ added in version 1.9.8. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: wxGTK3-devel%{?_isa} +Requires: wxGTK-devel%{?_isa} %description devel The %{name}-devel package contains libraries and header files for @@ -126,6 +126,18 @@ mv %{name}.pc %{buildroot}%{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Aug 05 2022 Martin Gansser 4.8.2-1 +- Update to 4.8.2 + +* Thu Aug 04 2022 Scott Talbert - 4.5.1-7 +- Rebuild with wxWidgets 3.2 + +* Sat Jul 23 2022 Fedora Release Engineering - 4.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 4.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 4.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 018acbad4c86c605e6dbd55eae40df64ac72f698 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 8 Aug 2022 11:34:28 +0200 Subject: [PATCH 2/5] Set wxversion to 3.0 for fedora <= 36 --- wxsqlite3.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/wxsqlite3.spec b/wxsqlite3.spec index 7aadf70..56fe54a 100644 --- a/wxsqlite3.spec +++ b/wxsqlite3.spec @@ -1,9 +1,13 @@ +# wx-config %global wxversion %(wx-config-3.0 --release) +%if 0%{?fedora} >= 37 +%global wxversion %(wx-config-3.2 --release) +%endif %global wxincdir %{_includedir}/wx-%{wxversion} Name: wxsqlite3 Version: 4.8.2 -Release: 1%{?dist} +Release: 3%{?dist} Summary: C++ wrapper around the SQLite 3.x database License: wxWidgets @@ -104,8 +108,8 @@ mv %{buildroot}%{_includedir}/wx %{buildroot}%{wxincdir} find %{buildroot} -name '*.la' -exec rm -f {} ';' # install pkgconfig file -mkdir -p %{buildroot}%{_libdir}/pkgconfig -mv %{name}.pc %{buildroot}%{_libdir}/pkgconfig/%{name}.pc +### mkdir -p %{buildroot}%{_libdir}/pkgconfig +###mv %{name}.pc %{buildroot}%{_libdir}/pkgconfig/%{name}.pc %ldconfig_scriptlets @@ -126,6 +130,12 @@ mv %{name}.pc %{buildroot}%{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Aug 08 2022 Martin Gansser 4.8.2-3 +- Set wxversion to 3.0 for fedora <= 36 + +* Sun Aug 07 2022 Martin Gansser 4.8.2-2 +- Set wxversion to 3.2 for fedora} >= 37 + * Fri Aug 05 2022 Martin Gansser 4.8.2-1 - Update to 4.8.2 From cfecc06b92347ed469ceeab9260fbb1d3e32a1a3 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 10 Aug 2022 15:37:05 +0200 Subject: [PATCH 3/5] Set wxversion to 3.1 for fedora <= 36 --- wxsqlite3.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wxsqlite3.spec b/wxsqlite3.spec index 56fe54a..efc5f58 100644 --- a/wxsqlite3.spec +++ b/wxsqlite3.spec @@ -1,5 +1,5 @@ # wx-config -%global wxversion %(wx-config-3.0 --release) +%global wxversion %(wx-config-3.1 --release) %if 0%{?fedora} >= 37 %global wxversion %(wx-config-3.2 --release) %endif @@ -7,7 +7,7 @@ Name: wxsqlite3 Version: 4.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ wrapper around the SQLite 3.x database License: wxWidgets @@ -15,7 +15,7 @@ URL: https://github.com/utelle/wxsqlite3 Source0: https://github.com/utelle/wxsqlite3/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # don't %%build the included wxSQLite+ application -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: wxGTK-devel @@ -130,6 +130,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Wed Aug 10 2022 Martin Gansser 4.8.2-4 +- Set wxversion to 3.1 for fedora <= 36 + * Mon Aug 08 2022 Martin Gansser 4.8.2-3 - Set wxversion to 3.0 for fedora <= 36 From 0c5c3faa04d354ce0423f24f86ca1551c4084e98 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 13 Aug 2022 15:39:45 +0200 Subject: [PATCH 4/5] 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 c750a1671cc74e9814ed34a1086c1ecaef894bd4 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 17 Oct 2022 15:53:14 +0200 Subject: [PATCH 5/5] 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