Merge branch 'master' into epel8

.gitignore

@@ -15,3 +15,7 @@
 /keepassxc-2.4.3-src.tar.xz
 /keepassxc-2.5.0-src.tar.xz
 /keepassxc-2.5.1-src.tar.xz
+/keepassxc-2.5.2-src.tar.xz
+/keepassxc-2.5.3-src.tar.xz
+/keepassxc-2.5.4-src.tar.xz
+/keepassxc-2.6.0-src.tar.xz

keepassxc.spec

@@ -1,18 +1,15 @@
+%undefine __cmake_in_source_build
 # EPEL7 not possible because libgcrypt version is 1.5
 
 Name:           keepassxc
-Version:        2.5.1
+Version:        2.6.0
 Release:        1%{?dist}
 Summary:        Cross-platform password manager
 License:        Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain
 URL:            http://www.keepassxc.org/
 Source0:     	https://github.com/keepassxreboot/keepassxc/releases/download/%{version}/keepassxc-%{version}-src.tar.xz
 
-%if 0%{?el7}
-BuildRequires: cmake3 >= 3.1
-%else
 BuildRequires: cmake >= 3.1
-%endif
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++ >= 4.7
 BuildRequires:  qt5-qtbase-devel >= 5.2
@@ -37,6 +34,9 @@ BuildRequires:  quazip-qt5-devel
 BuildRequires:  ykpers-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libappstream-glib
+BuildRequires:  qt5-qtbase-private-devel
+BuildRequires:  readline-devel
+BuildRequires:  rubygem-asciidoctor
 
 %description
 KeePassXC is a community fork of KeePassX
@@ -61,21 +61,22 @@ information can be considered as quite safe.
 %autosetup
 
 %build
-mkdir build
+# This package fails to build with LTO due to undefined symbols.  LTO
-cd build
+# was disabled in OpenSuSE as well, but with no real explanation why
+# beyond the undefined symbols.  It really shold be investigated further.
+# Disable LTO
+%define _lto_cflags %{nil}
 
-%cmake .. \
+%cmake \
     -DWITH_TESTS=OFF \
     -DWITH_XC_ALL=ON \
     -DWITH_XC_KEESHARE_SECURE=ON \
     -WITH_XC_UPDATECHECK=OFF \
     -DCMAKE_BUILD_TYPE=Release
- 
+%cmake_build
-%make_build
  
 %install
-cd build
+%cmake_install
-%make_install
  
 desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications \
@@ -101,7 +102,7 @@ install -D -m 644 -p x-keepassxc.desktop \
 %find_lang keepassx --with-qt
 
 %check
-ctest -V %{?_smp_mflags}
+%ctest
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.%{name}.KeePassXC.desktop
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml
 
@@ -122,6 +123,24 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Jul 07 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.6.0-1
+- Update to 2.6.0
+
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 2.5.4-2
+- Diable LTO
+
+* Thu Apr 09 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.5.4-1
+- Update to 2.5.4
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 20 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.5.3-1
+- Update to 2.5.3
+
+* Sun Jan 05 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.5.2-1
+- Update to 2.5.2
+
 * Tue Nov 12 2019 Germano Massullo <germano.massullo@gmail.com> - 2.5.1-1
 - 2.5.1 release
 

sources

@@ -1 +1 @@
-SHA512 (keepassxc-2.5.1-src.tar.xz) = 5500a0e697758e7616754d1b612ad7a64485d9efa1aeb0c3714060db50ffd39ea0aaa0c42d86d17044b834f32e99172ea94bc2485d396a381c8e9212d8be8b37
+SHA512 (keepassxc-2.6.0-src.tar.xz) = c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17