diff --git a/qca.spec b/qca.spec index 2b106e0..6829827 100644 --- a/qca.spec +++ b/qca.spec @@ -1,10 +1,14 @@ %undefine __cmake_in_source_build +%if 0%{?fedora} < 34 +%global botan 1 +%endif + Name: qca Summary: Qt Cryptographic Architecture Version: 2.3.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: https://userbase.kde.org/QCA @@ -17,7 +21,6 @@ Source0: http://download.kde.org/stable/qca/%{version}/qca-%{version}.tar.xz BuildRequires: cmake >= 2.8.12 BuildRequires: gcc-c++ BuildRequires: libgcrypt-devel -BuildRequires: pkgconfig(botan-2) BuildRequires: pkgconfig(libcrypto) pkgconfig(libssl) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(libpkcs11-helper-1) @@ -35,6 +38,10 @@ Obsoletes: qca2 < 2.1.0 Provides: qca2 = %{version}-%{release} Provides: qca2%{?_isa} = %{version}-%{release} +%if ! 0%{?botan} +Obsoletes: qca-qt5-botan < %{version}-%{release} +%endif + # most runtime consumers seem to assume the ossl plugin be present Recommends: %{name}-ossl%{?_isa} @@ -64,11 +71,14 @@ BuildArch: noarch %description doc This package includes QCA API documentation in HTML +%if 0%{?botan} %package botan Summary: Botan plugin for the Qt Cryptographic Architecture +BuildRequires: pkgconfig(botan-2) Requires: %{name}%{?_isa} = %{version}-%{release} %description botan %{summary}. +%endif %package cyrus-sasl Summary: Cyrus-SASL plugin for the Qt Cryptographic Architecture @@ -139,11 +149,14 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description qt5-devel %{summary}. +%if 0%{?botan} %package qt5-botan Summary: Botan plugin for the Qt5 Cryptographic Architecture +BuildRequires: pkgconfig(botan-2) Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description qt5-botan %{summary}. +%endif %package qt5-cyrus-sasl Summary: Cyrus-SASL plugin for the Qt5 Cryptographic Architecture @@ -207,7 +220,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} -DQCA_LIBRARY_INSTALL_DIR:PATH=%{_qt5_libdir} \ -DQCA_PLUGINS_INSTALL_DIR:PATH=%{_qt5_plugindir} \ -DQCA_PRIVATE_INCLUDE_INSTALL_DIR:PATH=%{_qt5_headerdir} \ - -DQT4_BUILD:BOOL=OFF + -DWITH_botan_PLUGIN:BOOL=%{?botan:ON}%{?!botan:OFF} %cmake_build @@ -254,9 +267,11 @@ test "$(pkg-config --modversion qca2-qt5)" = "%{version}" %{_libdir}/cmake/Qca-qt5/ %{_qt5_archdatadir}/mkspecs/features/crypto.prf +%if 0%{?botan} %files qt5-botan %doc plugins/qca-botan/README %{_qt5_plugindir}/crypto/libqca-botan.so +%endif %files qt5-cyrus-sasl %doc plugins/qca-gcrypt/README @@ -291,6 +306,9 @@ test "$(pkg-config --modversion qca2-qt5)" = "%{version}" %changelog +* Tue Nov 03 2020 Rex Dieter - 2.3.1-4 +- drop botan for f34+ (#1892893) + * Wed Aug 26 2020 Rex Dieter - 2.3.1-3 - rebuild (botan)