From 93a280c8a161c082a575f10d0ba5337e0d56b2f2 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 5 Feb 2020 11:53:13 +0100 Subject: [PATCH] Update to 4.5.1 --- .gitignore | 1 + sources | 2 +- wxsqlite3.spec | 57 ++++++++++++++++---------------------------------- 3 files changed, 20 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 0ba1bc2..6e76147 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /wxsqlite3-b05867d.tar.gz /wxsqlite3-6feb9d1.tar.gz /wxsqlite3-91de286.tar.gz +/wxsqlite3-4.5.1.tar.gz diff --git a/sources b/sources index d5d4a1c..380b8fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxsqlite3-91de286.tar.gz) = 3ab61dfc50c41b4ca25360250b7b24007529d582008b86cfafdd79cec7590bdb9f41514190b729b727b9aafc6eacb5b7864243730186d57489657471c57b4267 +SHA512 (wxsqlite3-4.5.1.tar.gz) = e9a5c888ca61a5b3f1bf1247b44dab938646eda7b215ec7a8f2f993d26b1785d40343abfb66d9e99aad39a8028ba64ce54d29fb76ecdd0550820b6c1295438bb diff --git a/wxsqlite3.spec b/wxsqlite3.spec index 53fb27f..504fe72 100644 --- a/wxsqlite3.spec +++ b/wxsqlite3.spec @@ -1,17 +1,14 @@ -# https://github.com/utelle/wxsqlite3/commit/91de286b494f1a5239c9fc6fecbc21319a17e61b -%global commit0 91de286b494f1a5239c9fc6fecbc21319a17e61b -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global wxversion %(wx-config-3.0 --release) %global wxincdir %{_includedir}/wx-%{wxversion} Name: wxsqlite3 -Version: 3.4.1 -Release: 0.10git%{shortcommit0}%{?dist} +Version: 4.5.1 +Release: 1%{?dist} Summary: C++ wrapper around the SQLite 3.x database License: wxWidgets URL: https://github.com/utelle/wxsqlite3 -Source0: https://github.com/utelle/wxsqlite3/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz +Source0: https://github.com/utelle/wxsqlite3/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # don't %%build the included wxSQLite+ application BuildRequires: gcc @@ -20,6 +17,8 @@ BuildRequires: wxGTK3-devel BuildRequires: sqlite-devel BuildRequires: doxygen BuildRequires: dos2unix +BuildRequires: autoconf +BuildRequires: automake %description @@ -60,19 +59,16 @@ that use %{name}. %prep -%autosetup -n %{name}-%{commit0} +%autosetup -n %{name}-%{version} # activate correct build folder -mv build30 build +#mv build30 build # delete bundled sqlite3 files find -name sqlite3 -type d | xargs rm -rfv # set correct permission -chmod a+x configure - -# use correct wx-config file -sed -i -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=wx-config-3.0|g' configure +#chmod a+x configure # fixex E: wrong-script-end-of-line-encoding dos2unix readme.md @@ -85,7 +81,11 @@ chmod a-x include/wx/wxsqlite3.h src/wxsqlite3.cpp chmod -x LICENCE.txt readme.md %build -%configure +#autoreconf --install --force +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 %make_build # build docs @@ -125,32 +125,11 @@ mv %{name}.pc %{buildroot}%{_libdir}/pkgconfig/%{name}.pc %changelog -* Fri Jan 31 2020 Fedora Release Engineering - 3.4.1-0.10git91de286 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Feb 04 2020 Martin Gansser 4.5.1-1 +- Update to 4.5.1 -* 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 +* Thu Feb 02 2017 Martin Gansser 3.5.1-0.1git6a5a00b +- Update to 3.5.1-0.1git6a5a00b * Wed Nov 02 2016 Martin Gansser 3.4.1-0.1git91de286 - Update to 3.4.1-0.1git91de286 @@ -169,7 +148,7 @@ mv %{name}.pc %{buildroot}%{_libdir}/pkgconfig/%{name}.pc * Sat Feb 06 2016 Martin Gansser 3.3.0-3 - Added BR dos2unix -- fixed rpmlint warnings +- fixe rpmlint warnings * Fri Feb 05 2016 Fedora Release Engineering - 3.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild