From 40e93ccd9cf005e2197dabceaf6cac4e366dfe3e Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Thu, 21 Jan 2021 20:36:27 +0100 Subject: [PATCH] enabled EPEL8 builds --- keepassxc.spec | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/keepassxc.spec b/keepassxc.spec index 8882d81..ea88994 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -3,7 +3,7 @@ Name: keepassxc Version: 2.6.3 -Release: 1%{?dist} +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/ @@ -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,26 @@ 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 \ -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} + -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 +137,17 @@ 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