diff --git a/.gitignore b/.gitignore index 9bda66f..f6b3c27 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ /keepassxc-2.5.3-src.tar.xz /keepassxc-2.5.4-src.tar.xz /keepassxc-2.6.0-src.tar.xz +/keepassxc-2.6.1-src.tar.xz +/keepassxc-2.6.2-src.tar.xz +/keepassxc-2.6.3-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index 958401b..1adc7b6 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -2,14 +2,14 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.6.0 -Release: 1%{?dist} +Version: 2.6.3 +Release: 2%{?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 -BuildRequires: cmake >= 3.1 +BuildRequires: cmake >= 3.1 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ >= 4.7 BuildRequires: qt5-qtbase-devel >= 5.2 @@ -25,10 +25,11 @@ BuildRequires: libXi-devel BuildRequires: libXtst-devel BuildRequires: libyubikey-devel BuildRequires: qt5-qtx11extras-devel -# For quazip read https://bugzilla.redhat.com/show_bug.cgi?id=1754061#c1 -%if 0%{?el8} -BuildRequires: quazip-devel -%else +# For EL8 missing quazip read +# https://bugzilla.redhat.com/show_bug.cgi?id=1859390 +# https://bugzilla.redhat.com/show_bug.cgi?id=1754061#c1 +# https://bugzilla.redhat.com/show_bug.cgi?id=1754155 +%if 0%{?fedora} BuildRequires: quazip-qt5-devel %endif BuildRequires: ykpers-devel @@ -36,8 +37,12 @@ BuildRequires: zlib-devel BuildRequires: libappstream-glib BuildRequires: qt5-qtbase-private-devel BuildRequires: readline-devel +# For EL8 missing rubygem-asciidoctor read +# https://bugzilla.redhat.com/show_bug.cgi?id=1859390 +# https://bugzilla.redhat.com/show_bug.cgi?id=1820896 +%if 0%{?fedora} BuildRequires: rubygem-asciidoctor - +%endif %description KeePassXC is a community fork of KeePassX KeePassXC is an application for people with extremely high demands on secure @@ -66,13 +71,27 @@ information can be considered as quite safe. # beyond the undefined symbols. It really shold be investigated further. # Disable LTO %define _lto_cflags %{nil} - +%if 0%{?fedora} %cmake \ -DWITH_TESTS=OFF \ -DWITH_XC_ALL=ON \ -DWITH_XC_KEESHARE_SECURE=ON \ - -WITH_XC_UPDATECHECK=OFF \ + -DWITH_XC_UPDATECHECK=OFF \ -DCMAKE_BUILD_TYPE=Release +%endif +# -DWITH_XC_DOCS=OFF is needed on EL due missing rubygem-asciidoctor +# For EL8 missing rubygem-asciidoctor read +# https://bugzilla.redhat.com/show_bug.cgi?id=1859390 +# https://bugzilla.redhat.com/show_bug.cgi?id=1820896 +%if 0%{?el8} +%cmake \ + -DWITH_TESTS=OFF \ + -DWITH_XC_ALL=ON \ + -DWITH_XC_KEESHARE_SECURE=ON \ + -DWITH_XC_UPDATECHECK=OFF \ + -DWITH_XC_DOCS=OFF \ + -DCMAKE_BUILD_TYPE=Release +%endif %cmake_build %install @@ -119,10 +138,32 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_datadir}/mime/packages/*.xml %{_datadir}/icons/hicolor/*/*/*keepassxc* %{_libdir}/%{name} +# Missing rubygem-asciidoctor in EL8 does not allow having documentation in EL8 +# Read https://bugzilla.redhat.com/show_bug.cgi?id=1859390 +%if 0%{?fedora} %{_mandir}/man1/%{name}-cli.1* %{_mandir}/man1/%{name}.1* +%endif %changelog +* Thu Jan 21 2021 Germano Massullo - 2.6.3-2 +- EL8: disabled documentation, removed rubygem-asciidoctor and quazip depencendies. For bugzilla tickets about missing dependencies, read this spec file near Fedora/EL8 macros + +* Wed Jan 13 2021 Mukundan Ragavan - 2.6.3-1 +- Update to 2.6.3 + +* Mon Oct 26 2020 Germano Massullo - 2.6.2-2 +- replaced -WITH_XC_UPDATECHECK=OFF with -DWITH_XC_UPDATECHECK=OFF Read https://bugzilla.redhat.com/show_bug.cgi?id=1887609 + +* Fri Oct 23 2020 Mukundan Ragavan - 2.6.2-1 +- Update to 2.6.2 + +* Thu Aug 20 2020 Germano Massullo - 2.6.1-1 +- 2.6.1 release + +* Tue Jul 28 2020 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 07 2020 Mukundan Ragavan - 2.6.0-1 - Update to 2.6.0 diff --git a/sources b/sources index f8bcbdf..061bfda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.6.0-src.tar.xz) = c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17 +SHA512 (keepassxc-2.6.3-src.tar.xz) = 37f97c0851731badffc9c40ed2dcc5c8fc200ea96b32281c21cf199799681abbd74fb191140022ad7872d69ee139e12646e19697010f539690e4e0f0f1c92558