diff --git a/.gitignore b/.gitignore index 296b364..5468184 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,37 @@ /wxsqlite3-3.2.0.tar.gz /wxsqlite3-3.2.1.tar.gz /wxsqlite3-3.3.0.tar.gz +/wxsqlite3-3.3.1.tar.gz +/wxsqlite3-b05867d.tar.gz +/wxsqlite3-6feb9d1.tar.gz +/wxsqlite3-91de286.tar.gz +/wxsqlite3-4.5.1.tar.gz +/wxsqlite3-4.8.2.tar.gz +/wxsqlite3-4.9.10.tar.gz +/wxsqlite3-4.9.11.tar.gz +/wxsqlite3-4.9.12.tar.gz +/wxsqlite3-4.10.0.tar.gz +/wxsqlite3-4.10.1.tar.gz +/wxsqlite3-4.10.2.tar.gz +/wxsqlite3-4.10.3.tar.gz +/wxsqlite3-4.10.4.tar.gz +/wxsqlite3-4.10.5.tar.gz +/wxsqlite3-4.10.6.tar.gz +/wxsqlite3-4.10.7.tar.gz +/wxsqlite3-4.10.8.tar.gz +/wxsqlite3-4.10.9.tar.gz +/wxsqlite3-4.10.10.tar.gz +/wxsqlite3-4.10.11.tar.gz +/wxsqlite3-4.10.12.tar.gz +/wxsqlite3-4.11.0.tar.gz +/wxsqlite3-4.11.1.tar.gz +/wxsqlite3-4.11.2.tar.gz +/wxsqlite3-4.12.0.tar.gz +/wxsqlite3-4.12.1.tar.gz +/wxsqlite3-4.12.2.tar.gz +/wxsqlite3-4.12.3.tar.gz +/wxsqlite3-4.12.4.tar.gz +/wxsqlite3-4.12.5.tar.gz +/wxsqlite3-4.12.6.tar.gz +/wxsqlite3-4.12.7.tar.gz +/wxsqlite3-5.0.1.tar.gz diff --git a/sources b/sources index 78fcd3c..4aee81a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a718a8ec885aa82ee3192b2765214fef wxsqlite3-3.3.0.tar.gz -1d6bb74e56a8190706c6862ab9dd5004 wxsqlite3-3.0.3.pc.in +SHA512 (wxsqlite3-5.0.1.tar.gz) = 59c635a5254247276249f8c151ffae0ab8bdeb3f0c27a255313ba5e215f11c42b04699d23b217cf3fd446daec1b2f18376cb26761bc9fc528312fabeebe69f39 diff --git a/wxsqlite3.spec b/wxsqlite3.spec index e2ae01e..e2b0e57 100644 --- a/wxsqlite3.spec +++ b/wxsqlite3.spec @@ -1,22 +1,26 @@ -%global wxversion %(wx-config --release) +# wx-config +%global wxversion %(wx-config-3.2 --release) %global wxincdir %{_includedir}/wx-%{wxversion} Name: wxsqlite3 -Version: 3.3.0 +Version: 5.0.1 Release: 1%{?dist} Summary: C++ wrapper around the SQLite 3.x database -Group: System Environment/Libraries -License: wxWidgets -URL: http://wxcode.sourceforge.net/components/wxsqlite3/ -Source0: http://downloads.sourceforge.net/wxcode/%{name}-%{version}.tar.gz -# https://sourceforge.net/p/wxcode/bugs/_discuss/thread/d8bda5df/e523/attachment/wxsqlite3-3.0.3.pc.in -Source1: %{name}-3.0.3.pc.in +License: LGPL-3.0-or-later WITH WxWindows-exception-3.1 +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: gcc +BuildRequires: gcc-c++ BuildRequires: wxGTK-devel BuildRequires: sqlite-devel +BuildRequires: doxygen +BuildRequires: dos2unix +BuildRequires: autoconf +BuildRequires: automake %description @@ -40,7 +44,6 @@ added in version 1.9.8. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: wxGTK-devel%{?_isa} @@ -50,7 +53,6 @@ developing applications that use %{name}. %package doc Summary: Documentation files for %{name} -Group: Documentation BuildArch: noarch %description doc @@ -59,45 +61,59 @@ that use %{name}. %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} + +# activate correct build folder +#mv build30 build # delete bundled sqlite3 files find -name sqlite3 -type d | xargs rm -rfv -# copy correct configure file and set permission -chmod a+x configure30 configure -cp configure30 configure -cp %{SOURCE1} %{name}.pc.in +# set correct permission +#chmod a+x configure +# fixex E: wrong-script-end-of-line-encoding +dos2unix readme.md + +# fixes W: spurious-executable-perm +find docs -type f -exec chmod a-x {} \; +chmod a-x include/wx/wxsqlite3.h src/wxsqlite3.cpp + +# fixes E: script-without-shebang +chmod -x LICENCE.txt readme.md %build -%configure -make %{?_smp_mflags} - +%set_build_flags + +# disable GCC LTO froür wxSQLite3 +export CFLAGS="%{build_cflags} -fno-lto" +export CXXFLAGS="%{build_cxxflags} -fno-lto" + +#autoreconf --install --force +autoreconf +%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 +sed -i -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=wx-config-3.2|g' configure + +%make_build + +# build docs +pushd docs +doxygen +popd %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install INSTALL="install -p" # move headers from /usr/include/wx to /usr/include/wx-?.?/wx -mkdir ${RPM_BUILD_ROOT}%{wxincdir} -mv ${RPM_BUILD_ROOT}%{_includedir}/wx ${RPM_BUILD_ROOT}%{wxincdir} +mkdir %{buildroot}%{wxincdir} +mv %{buildroot}%{_includedir}/wx %{buildroot}%{wxincdir} -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - -# install own Debian-compatible pkgconfig file -mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig -sed -e "s!@VERSION@!3.3.0!" \ - -e "s!@LIBDIR@!%{_lib}!" \ - -e "s!@WXVERSION@!%{wxversion}!g" \ - %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc - -# libname has changed -sed -i 's|wxcode_gtk2_wxsqlite3|wxcode_gtk2u_wxsqlite3|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +find %{buildroot} -name '*.la' -exec rm -f {} ';' +%ldconfig_scriptlets %files %doc readme.md @@ -106,14 +122,206 @@ sed -i 's|wxcode_gtk2_wxsqlite3|wxcode_gtk2u_wxsqlite3|g' $RPM_BUILD_ROOT%{_libd %files devel %{wxincdir}/wx/* -%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc +%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/*.so %files doc %doc docs/html - %changelog +* Fri Aug 14 2026 Martin Gansser 5.0.1-1 +- Update to 5.0.1 + +* Thu Aug 06 2026 Martin Gansser 4.12.7-1 +- Update to 4.12.7 + +* Fri Jul 17 2026 Martin Gansser 4.12.6-1 +- Update to 4.12.6 + +* Mon Jun 08 2026 Martin Gansser 4.12.5-1 +- Update to 4.12.5 + +* Thu May 07 2026 Martin Gansser 4.12.4-1 +- Update to 4.12.4 + +* Tue Apr 14 2026 Martin Gansser 4.12.3-1 +- Update to 4.12.3 + +* Fri Mar 20 2026 Martin Gansser 4.12.2-1 +- Update to 4.12.2 + +* Sat Mar 14 2026 Martin Gansser 4.12.1-1 +- Update to 4.12.1 + +* Wed Mar 11 2026 Martin Gansser 4.12.0-1 +- Update to 4.12.0 + +* Sat Jan 17 2026 Fedora Release Engineering - 4.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Tue Jan 13 2026 Martin Gansser 4.11.2-1 +- Update to 4.11.2 + +* Fri Dec 05 2025 Martin Gansser 4.11.1-1 +- Update to 4.11.1 + +* Sun Nov 09 2025 Martin Gansser 4.11.0-1 +- Update to 4.11.0 + +* Sat Aug 02 2025 Martin Gansser 4.10.12-1 +- Update to 4.10.12 + +* Fri Jul 25 2025 Fedora Release Engineering - 4.10.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jul 19 2025 Martin Gansser 4.10.11-1 +- Update to 4.10.11 + +* Tue Jul 15 2025 Martin Gansser 4.10.10-1 +- Update to 4.10.10 + +* Thu Jul 10 2025 Martin Gansser 4.10.9-1 +- Update to 4.10.9 + +* Sat Jun 07 2025 Martin Gansser 4.10.8-1 +- Update to 4.10.8 + +* Sun Jun 01 2025 Martin Gansser 4.10.7-1 +- Update to 4.10.7 + +* Tue May 06 2025 Martin Gansser 4.10.6-1 +- Update to 4.10.6 + +* Tue Mar 04 2025 Martin Gansser 4.10.5-1 +- Update to 4.10.5 + +* Fri Feb 21 2025 Martin Gansser 4.10.4-1 +- Update to 4.10.4 + +* Tue Feb 11 2025 Martin Gansser 4.10.3-1 +- Update to 4.10.3 + +* Fri Jan 17 2025 Martin Gansser 4.10.2-1 +- Update to 4.10.2 + +* Tue Jan 07 2025 Martin Gansser 4.10.1-1 +- Update to 4.10.1 + +* Thu Jan 02 2025 Martin Gansser 4.10.0-1 +- Update to 4.10.0 + +* Wed Oct 23 2024 Martin Gansser 4.9.12-1 +- Update to 4.9.12 + +* Mon Sep 23 2024 Martin Gansser - 4.9.11-3 +- Migrate to SPDX license + +* Sat Jul 20 2024 Fedora Release Engineering - 4.9.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sun Jun 16 2024 Martin Gansser 4.9.11-1 +- Update to 4.9.11 + +* Wed May 29 2024 Martin Gansser 4.9.10-1 +- Update to 4.9.10 + +* Sat Jan 27 2024 Fedora Release Engineering - 4.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 4.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 4.8.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* 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 + +* 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 + +* 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 + +* 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 + +* Wed Jan 27 2021 Fedora Release Engineering - 4.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 4.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Feb 04 2020 Martin Gansser 4.5.1-1 +- Update to 4.5.1 + +* Fri Jan 31 2020 Fedora Release Engineering - 3.4.1-0.10git91de286 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 3.4.1-0.9git91de286 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3.4.1-0.8git91de286 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 21 2018 Martin Gansser 3.4.1-0.7git91de286 +- Fix FTBFS due missing BR gcc-c++ (RHBZ#1606715) + +* Sat Jul 14 2018 Fedora Release Engineering - 3.4.1-0.6git91de286 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 3.4.1-0.5git91de286 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 3.4.1-0.4git91de286 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.4.1-0.3git91de286 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 3.4.1-0.2git91de286 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Nov 02 2016 Martin Gansser 3.4.1-0.1git91de286 +- Update to 3.4.1-0.1git91de286 + +* Sun Aug 28 2016 Martin Gansser 3.4.0-0.1git6feb9d1 +- Update to 3.4.0-0.1git6feb9d1 + +* Sun Apr 24 2016 Martin Gansser 3.3.2-0.1gitb05867d +- switched to github +- added BR doxygen +- spec file cleanup + +* Sun Apr 10 2016 Martin Gansser 3.3.1-1 +- Update to 3.3.1 +- Replaced BR wxGTK-devel by wxGTK3-devel + +* Sat Feb 06 2016 Martin Gansser 3.3.0-3 +- Added BR dos2unix +- fixed rpmlint warnings + +* Fri Feb 05 2016 Fedora Release Engineering - 3.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Dec 18 2015 Martin Gansser 3.3.0-1 - Update to 3.3.0