The package rpms/qca.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qca.git/commit/?id=e459a8d3602467...
https://src.fedoraproject.org/cgit/rpms/qca.git/commit/?id=67bd74883faf90....
Change:
+%ifnarch s390x ppc64
+%ifnarch %{arm} ppc64 s390x
Thanks.
Full change:
============
commit 1f9137ddc75f31b46735c63eb82a9a9e9df2373d
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Thu Apr 25 09:05:02 2019 -0500
2.2.1
diff --git a/.gitignore b/.gitignore
index ab73467..fada045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/qca-2.2.0-20180619git.tar.xz
/qca-2.2.0-20181017git.tar.xz
/qca-2.2.0.tar.xz
+/qca-2.2.1.tar.xz
diff --git a/qca.spec b/qca.spec
index 26b6c26..cd9a37e 100644
--- a/qca.spec
+++ b/qca.spec
@@ -12,7 +12,7 @@
Name: qca
Summary: Qt Cryptographic Architecture
-Version: 2.2.0
+Version: 2.2.1
Release: 1%{?dist}
License: LGPLv2+
@@ -411,6 +411,9 @@ make test ARGS="--timeout 180 --output-on-failure" -C
%{_target_platform}-qt5
%changelog
+* Thu Apr 25 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.1-1
+- 2.2.1
+
* Mon Apr 22 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-1
- 2.2.0 formal release
diff --git a/sources b/sources
index 3cac004..8c16322 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qca-2.2.0.tar.xz) =
2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
+SHA512 (qca-2.2.1.tar.xz) =
3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
commit e9973bd3010e54d52bb5037dc82d0a9302216d08
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Apr 22 14:55:44 2019 -0500
2.2.0 formal release
diff --git a/.gitignore b/.gitignore
index e6f2e39..ab73467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/qca-2.2.0-20180105git.tar.xz
/qca-2.2.0-20180619git.tar.xz
/qca-2.2.0-20181017git.tar.xz
+/qca-2.2.0.tar.xz
diff --git a/qca.spec b/qca.spec
index 1db10af..26b6c26 100644
--- a/qca.spec
+++ b/qca.spec
@@ -8,12 +8,12 @@
%global botan 1
%endif
-%global snap 20181017
+#global snap 20181017
Name: qca
Summary: Qt Cryptographic Architecture
Version: 2.2.0
-Release: 0.10.%{snap}%{?dist}
+Release: 1%{?dist}
License: LGPLv2+
URL:
https://userbase.kde.org/QCA
@@ -21,7 +21,7 @@ URL:
https://userbase.kde.org/QCA
Source0: qca-%{version}-%{snap}git.tar.xz
Source10: qca.sh
%else
-Source0:
http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz
+Source0:
http://download.kde.org/stable/qca/%{version}/qca-%{version}.tar.xz
%endif
## upstream patches
@@ -411,6 +411,9 @@ make test ARGS="--timeout 180 --output-on-failure" -C
%{_target_platform}-qt5
%changelog
+* Mon Apr 22 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-1
+- 2.2.0 formal release
+
* Tue Feb 12 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.10.20181017
- make qt4 tests non-fatal
diff --git a/sources b/sources
index 75d450f..3cac004 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qca-2.2.0-20181017git.tar.xz) =
638257d90f53ff56ad56e7a336e13fbcbe43f8f92bd44b667fa5b7b318174e505b6ba6c11047716275b22f6152ff37246dcd7c498356bfe4a248fb6b8d4511e7
+SHA512 (qca-2.2.0.tar.xz) =
2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
commit 67bd74883faf90f97b80c8a0924baa800d7a1d47
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Feb 12 14:40:42 2019 -0600
make qt4 tests non-fatal
diff --git a/qca.spec b/qca.spec
index 687243d..1db10af 100644
--- a/qca.spec
+++ b/qca.spec
@@ -13,7 +13,7 @@
Name: qca
Summary: Qt Cryptographic Architecture
Version: 2.2.0
-Release: 0.9.%{snap}%{?dist}
+Release: 0.10.%{snap}%{?dist}
License: LGPLv2+
URL:
https://userbase.kde.org/QCA
@@ -278,10 +278,10 @@ cp -a %{_target_platform}/apidocs/html/ \
export CTEST_OUTPUT_ON_FAILURE=1
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
# skip slow archs
-%ifnarch s390x ppc64
+%ifnarch %{arm} ppc64 s390x
%if 0%{?qt4}
test "$(pkg-config --modversion qca2)" = "%{version}"
-make test ARGS="--timeout 180 --output-on-failure" -C %{_target_platform}
+make test ARGS="--timeout 180 --output-on-failure" -C %{_target_platform} ||:
%endif
%if 0%{?qt5}
test "$(pkg-config --modversion qca2-qt5)" = "%{version}"
@@ -411,6 +411,9 @@ make test ARGS="--timeout 180 --output-on-failure" -C
%{_target_platform}-qt5
%changelog
+* Tue Feb 12 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.10.20181017
+- make qt4 tests non-fatal
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.2.0-0.9.20181017
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 0b5eae670b26d8f2422b5c896198e3cebb30c299
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 2 10:27:24 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/qca.spec b/qca.spec
index e072f04..687243d 100644
--- a/qca.spec
+++ b/qca.spec
@@ -13,7 +13,7 @@
Name: qca
Summary: Qt Cryptographic Architecture
Version: 2.2.0
-Release: 0.8.%{snap}%{?dist}
+Release: 0.9.%{snap}%{?dist}
License: LGPLv2+
URL:
https://userbase.kde.org/QCA
@@ -411,6 +411,9 @@ make test ARGS="--timeout 180 --output-on-failure" -C
%{_target_platform}-qt5
%changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.2.0-0.9.20181017
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Wed Oct 24 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.8.20181017
- 2.2.0-20181017 snapshot
commit a539b87fc37aaa94a3f31227d46c56e9b1dc410f
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Oct 24 11:18:43 2018 -0500
2.2.0-20181017 snapshot
diff --git a/.gitignore b/.gitignore
index 7d29887..e6f2e39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/qca-2.1.3.tar.xz
/qca-2.2.0-20180105git.tar.xz
/qca-2.2.0-20180619git.tar.xz
+/qca-2.2.0-20181017git.tar.xz
diff --git a/qca.spec b/qca.spec
index c1a749f..e072f04 100644
--- a/qca.spec
+++ b/qca.spec
@@ -8,12 +8,12 @@
%global botan 1
%endif
-%global snap 20180619
+%global snap 20181017
Name: qca
Summary: Qt Cryptographic Architecture
Version: 2.2.0
-Release: 0.7.%{snap}%{?dist}
+Release: 0.8.%{snap}%{?dist}
License: LGPLv2+
URL:
https://userbase.kde.org/QCA
@@ -411,6 +411,9 @@ make test ARGS="--timeout 180 --output-on-failure" -C
%{_target_platform}-qt5
%changelog
+* Wed Oct 24 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.8.20181017
+- 2.2.0-20181017 snapshot
+
* Wed Oct 24 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.7.20180619
- (re)enable botan support for real
diff --git a/sources b/sources
index 3e1671f..75d450f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qca-2.2.0-20180619git.tar.xz) =
6c96d0f629ccfdcaa4ca09e74b8ae3d59c91798cc1f3a79ecad67e0177a12b423cb3f02ddb10b1ce2a685e0aa3f60c6c18ea11389c33ce81e9c2c280eac80295
+SHA512 (qca-2.2.0-20181017git.tar.xz) =
638257d90f53ff56ad56e7a336e13fbcbe43f8f92bd44b667fa5b7b318174e505b6ba6c11047716275b22f6152ff37246dcd7c498356bfe4a248fb6b8d4511e7
commit 9b3cb7a3178139ab9d4dff1f0f95612ef49308b3
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Oct 24 11:14:49 2018 -0500
(re)enable botan support for real
diff --git a/qca.spec b/qca.spec
index c8a1178..c1a749f 100644
--- a/qca.spec
+++ b/qca.spec
@@ -4,7 +4,7 @@
%endif
%global qt5 1
-%if 0%{?fedora} > 26 && 0%{?rhel} > 7
+%if 0%{?fedora} > 26 || 0%{?rhel} > 7
%global botan 1
%endif
@@ -13,7 +13,7 @@
Name: qca
Summary: Qt Cryptographic Architecture
Version: 2.2.0
-Release: 0.6.%{snap}%{?dist}
+Release: 0.7.%{snap}%{?dist}
License: LGPLv2+
URL:
https://userbase.kde.org/QCA
@@ -411,6 +411,9 @@ make test ARGS="--timeout 180 --output-on-failure" -C
%{_target_platform}-qt5
%changelog
+* Wed Oct 24 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.7.20180619
+- (re)enable botan support for real
+
* Mon Sep 10 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.6.20180619
- Recommends: qca(-qt5)-ossl
commit 6408d03f240a688dff316326a801a27f866d6db3
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Sep 10 10:08:09 2018 -0500
make dep arch-specific
diff --git a/qca.spec b/qca.spec
index f3a5f0d..c8a1178 100644
--- a/qca.spec
+++ b/qca.spec
@@ -54,7 +54,7 @@ Provides: qca2 = %{version}-%{release}
Provides: qca2%{?_isa} = %{version}-%{release}
# most runtime consumers seem to assume the ossl plugin be present
-Recommends: %{name}-ossl
+Recommends: %{name}-ossl%{?_isa}
%description
Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -145,7 +145,7 @@ BuildRequires: pkgconfig(Qt5Core)
Obsoletes: qca-qt5-botan < %{version}-%{release}
%endif
# most runtime consumers seem to assume the ossl plugin be present
-Recommends: %{name}-qt5-ossl
+Recommends: %{name}-qt5-ossl%{?_isa}
%description qt5
Taking a hint from the similarly-named Java Cryptography Architecture,
QCA aims to provide a straightforward and cross-platform crypto API,
commit b3b3030b32fa487b49befdc4cbca40e37c15dc77
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Sep 10 10:06:27 2018 -0500
Recommends: qca(-qt5)-ossl
diff --git a/qca.spec b/qca.spec
index 996825b..f3a5f0d 100644
--- a/qca.spec
+++ b/qca.spec
@@ -13,7 +13,7 @@
Name: qca
Summary: Qt Cryptographic Architecture
Version: 2.2.0
-Release: 0.5.%{snap}%{?dist}
+Release: 0.6.%{snap}%{?dist}
License: LGPLv2+
URL:
https://userbase.kde.org/QCA
@@ -48,12 +48,14 @@ BuildRequires: pkgconfig(QtCore)
BuildRequires: doxygen-latex
BuildRequires: graphviz
-
# qca2 renamed qca
Obsoletes: qca2 < 2.1.0
Provides: qca2 = %{version}-%{release}
Provides: qca2%{?_isa} = %{version}-%{release}
+# most runtime consumers seem to assume the ossl plugin be present
+Recommends: %{name}-ossl
+
%description
Taking a hint from the similarly-named Java Cryptography Architecture,
QCA aims to provide a straightforward and cross-platform crypto API,
@@ -142,6 +144,8 @@ BuildRequires: pkgconfig(Qt5Core)
%if ! 0%{?botan}
Obsoletes: qca-qt5-botan < %{version}-%{release}
%endif
+# most runtime consumers seem to assume the ossl plugin be present
+Recommends: %{name}-qt5-ossl
%description qt5
Taking a hint from the similarly-named Java Cryptography Architecture,
QCA aims to provide a straightforward and cross-platform crypto API,
@@ -407,6 +411,9 @@ make test ARGS="--timeout 180 --output-on-failure" -C
%{_target_platform}-qt5
%changelog
+* Mon Sep 10 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.6.20180619
+- Recommends: qca(-qt5)-ossl
+
* Tue Jul 24 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.5.20180619
- 2.2.0-20180619 snapshot
- (re)enable botan support
commit e459a8d3602467bbd17921865a7204d90a5c66ef
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jul 24 11:13:54 2018 -0500
skip slow archs (for now)
diff --git a/qca.spec b/qca.spec
index 03526a9..996825b 100644
--- a/qca.spec
+++ b/qca.spec
@@ -273,6 +273,8 @@ cp -a %{_target_platform}/apidocs/html/ \
%check
export CTEST_OUTPUT_ON_FAILURE=1
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
+# skip slow archs
+%ifnarch s390x ppc64
%if 0%{?qt4}
test "$(pkg-config --modversion qca2)" = "%{version}"
make test ARGS="--timeout 180 --output-on-failure" -C %{_target_platform}
@@ -281,6 +283,7 @@ make test ARGS="--timeout 180 --output-on-failure" -C
%{_target_platform}
test "$(pkg-config --modversion qca2-qt5)" = "%{version}"
make test ARGS="--timeout 180 --output-on-failure" -C %{_target_platform}-qt5
%endif
+%endif
%if 0%{?qt4}
commit e1c37b7bfb0b24fe255d4c549c697f60e3b2bf88
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jul 24 11:09:46 2018 -0500
increase test timeout
diff --git a/qca.spec b/qca.spec
index 4239522..03526a9 100644
--- a/qca.spec
+++ b/qca.spec
@@ -275,11 +275,11 @@ export CTEST_OUTPUT_ON_FAILURE=1
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
%if 0%{?qt4}
test "$(pkg-config --modversion qca2)" = "%{version}"
-make test ARGS="--timeout 60 --output-on-failure" -C %{_target_platform}
+make test ARGS="--timeout 180 --output-on-failure" -C %{_target_platform}
%endif
%if 0%{?qt5}
test "$(pkg-config --modversion qca2-qt5)" = "%{version}"
-make test ARGS="--timeout 60 --output-on-failure" -C %{_target_platform}-qt5
+make test ARGS="--timeout 180 --output-on-failure" -C %{_target_platform}-qt5
%endif
commit 1f5f1a7d2898d7bb66dc91404eaeaf21f3329390
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jul 24 09:53:50 2018 -0500
2.2.0-20180619 snapshot
(re)enable botan support
use %_qt5_archdatadir/mkspecs
diff --git a/.gitignore b/.gitignore
index d87debc..7d29887 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qca-2.1.3.tar.xz
/qca-2.2.0-20180105git.tar.xz
+/qca-2.2.0-20180619git.tar.xz
diff --git a/qca.spec b/qca.spec
index edce824..4239522 100644
--- a/qca.spec
+++ b/qca.spec
@@ -4,20 +4,16 @@
%endif
%global qt5 1
-%if 0%{?fedora} < 27 && 0%{?rhel} <= 7
+%if 0%{?fedora} > 26 && 0%{?rhel} > 7
%global botan 1
%endif
-%if 0%{?fedora} == 26
-%global compat_openssl10 1
-%endif
-
-%global snap 20180105
+%global snap 20180619
Name: qca
Summary: Qt Cryptographic Architecture
Version: 2.2.0
-Release: 0.4.%{snap}%{?dist}
+Release: 0.5.%{snap}%{?dist}
License: LGPLv2+
URL:
https://userbase.kde.org/QCA
@@ -36,17 +32,13 @@ BuildRequires: cmake >= 2.8.12
BuildRequires: gcc-c++
BuildRequires: libgcrypt-devel
%if 0%{?botan}
-BuildRequires: pkgconfig(botan-1.10)
+BuildRequires: pkgconfig(botan-2)
%else
Obsoletes: qca-botan < %{version}-%{release}
%endif
BuildRequires: pkgconfig(libcrypto) pkgconfig(libssl)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(libpkcs11-helper-1)
-%if 0%{?compat_openssl10}
-BuildRequires: compat-openssl10-pkcs11-helper-devel
-BuildRequires: compat-openssl10-devel
-%endif
BuildRequires: pkgconfig(libsasl2)
%if 0%{?qt4}
BuildRequires: pkgconfig(QtCore)
@@ -233,7 +225,7 @@ mkdir %{_target_platform}-qt5
pushd %{_target_platform}-qt5
%{cmake} .. \
-DQCA_BINARY_INSTALL_DIR:STRING=%{_bindir} \
- -DQCA_FEATURE_INSTALL_DIR:PATH=%{_qt5_prefix}/mkspecs/features \
+ -DQCA_FEATURE_INSTALL_DIR:PATH=%{_qt5_archdatadir}/mkspecs/features \
-DQCA_INCLUDE_INSTALL_DIR:PATH=%{_qt5_headerdir} \
-DQCA_LIBRARY_INSTALL_DIR:PATH=%{_qt5_libdir} \
-DQCA_PLUGINS_INSTALL_DIR:PATH=%{_qt5_plugindir} \
@@ -370,7 +362,7 @@ make test ARGS="--timeout 60 --output-on-failure" -C
%{_target_platform}-qt5
%{_qt5_libdir}/libqca-qt5.so
%{_libdir}/pkgconfig/qca2-qt5.pc
%{_libdir}/cmake/Qca-qt5/
-%{_qt5_prefix}/mkspecs/features/crypto.prf
+%{_qt5_archdatadir}/mkspecs/features/crypto.prf
%if 0%{?botan}
%files qt5-botan
@@ -412,6 +404,11 @@ make test ARGS="--timeout 60 --output-on-failure" -C
%{_target_platform}-qt5
%changelog
+* Tue Jul 24 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.5.20180619
+- 2.2.0-20180619 snapshot
+- (re)enable botan support
+- use %%_qt5_archdatadir/mkspecs
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.2.0-0.4.20180105
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 42fc53e..3e1671f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qca-2.2.0-20180105git.tar.xz) =
1a5ba580adbbb327c5c6e20f32b4bbaf9131006841c991342dcc578e3e2c323ee00f2b72f4be92271d2d72ef63607267d7905699e4816b6c65cb60b68bd39e1e
+SHA512 (qca-2.2.0-20180619git.tar.xz) =
6c96d0f629ccfdcaa4ca09e74b8ae3d59c91798cc1f3a79ecad67e0177a12b423cb3f02ddb10b1ce2a685e0aa3f60c6c18ea11389c33ce81e9c2c280eac80295
commit f4a372837281bfc5c15be795d895dc060310702d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 02:57:30 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/qca.spec b/qca.spec
index 232df15..edce824 100644
--- a/qca.spec
+++ b/qca.spec
@@ -17,7 +17,7 @@
Name: qca
Summary: Qt Cryptographic Architecture
Version: 2.2.0
-Release: 0.3.%{snap}%{?dist}
+Release: 0.4.%{snap}%{?dist}
License: LGPLv2+
URL:
https://userbase.kde.org/QCA
@@ -412,6 +412,9 @@ make test ARGS="--timeout 60 --output-on-failure" -C
%{_target_platform}-qt5
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.2.0-0.4.20180105
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Sun Mar 04 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 2.2.0-0.2.20180105
- use %%make_build %%ldconfig_scriptlets
- BR: gcc-c++