diff --git a/.gitignore b/.gitignore index 57bf1af..ff7d258 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /cqrlog-2.1.0.tar.gz /cqrlog-2.2.0.tar.gz /cqrlog-2.3.0.tar.gz +/cqrlog-2.4.0.tar.gz diff --git a/cqrlog-desktop.patch b/cqrlog-desktop.patch index f42521c..580624c 100644 --- a/cqrlog-desktop.patch +++ b/cqrlog-desktop.patch @@ -4,7 +4,7 @@ Terminal=false Type=Application Icon=cqrlog --Categories=Utility;Database;HamRadio -+Categories=Utility;Database;HamRadio; - Keywords=Ham;Radio;Log; +-Categories=Network;HamRadio ++Categories=Network;HamRadio; + Keywords=Ham;Radio;Log;cqrlog; diff --git a/cqrlog-mariadb.patch b/cqrlog-mariadb.patch deleted file mode 100644 index fc02ffa..0000000 --- a/cqrlog-mariadb.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up ./src/dData.pas.orig ./src/dData.pas ---- ./src/dData.pas.orig 2018-06-17 05:42:42.000000000 -0700 -+++ ./src/dData.pas 2018-10-26 15:07:05.053119031 -0700 -@@ -4221,7 +4221,11 @@ begin - Paths.Add('/lib/'); - Paths.Add('/usr/lib/mysql/'); - -- Result := MyFindFile('libmariadbclient.so*', Paths); -+ Result := MyFindFile('libmariadb.so*', Paths); -+ if (Result='') then -+ begin -+ Result := MyFindFile('libmariadbclient.so*', Paths) -+ end; - if (Result='') then - begin - Result := MyFindFile('libmysqlclient.so*', Paths) diff --git a/cqrlog.spec b/cqrlog.spec index 6bd6f77..009c4dc 100644 --- a/cqrlog.spec +++ b/cqrlog.spec @@ -1,6 +1,6 @@ Name: cqrlog -Version: 2.3.0 -Release: 5%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: An amateur radio contact logging program License: GPLv2 @@ -10,7 +10,7 @@ Source0: https://github.com/ok2cqr/cqrlog/archive/v%{version}/%{name}-%{version} # Fixes arm builds, translation improvements, and other bug fixes. Patch0: cqrlog-install.patch Patch1: cqrlog-desktop.patch -Patch2: cqrlog-mariadb.patch +#Patch2: cqrlog-mariadb.patch ExclusiveArch: %{fpc_arches} @@ -21,7 +21,7 @@ BuildRequires: desktop-file-utils Requires: mariadb-server # https://bugzilla.redhat.com/show_bug.cgi?id=1486480 -%if 0%{?fedora} >= 28 +%if 0%{?fedora} Requires: mariadb-connector-c # https://bugzilla.redhat.com/show_bug.cgi?id=1592176 Requires: mariadb-connector-c-devel @@ -88,8 +88,8 @@ appstream-util validate-relax --nonet \ %files -%license src/COPYING -%doc README.md src/AUTHORS src/CHANGELOG src/README +%license COPYING +%doc README.md AUTHORS CHANGELOG %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/appdata/%{name}.appdata.xml @@ -99,6 +99,9 @@ appstream-util validate-relax --nonet \ %changelog +* Mon Nov 11 2019 Richard Shaw - 2.4.0-1 +- Update to 2.4.0. + * Wed Jul 24 2019 Fedora Release Engineering - 2.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 69512ee..4bf4c85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cqrlog-2.3.0.tar.gz) = 1e045d194a05248711e6ec43ec65e8f3f24e4fedab887cc89dc1ef6aa6e53ece4d923c9142a6ef89d8e1c46de678a16d108d344f005fa255d008cb9c5e482000 +SHA512 (cqrlog-2.4.0.tar.gz) = aec7b43a0d4d1cd5b1af140db149058b4cff4893e6d8ed8d1ced729bedf27baa36b71d9fa7e5312ab94dd692953346d20f7f5a55a05ba91e4eccb17919d6d49a