From b9fd96ad7080f845b5b27ebf890944ee9989675c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 4 Jun 2024 13:07:52 +0200 Subject: [PATCH] Add rpminspect.yaml and fix dependencies Resolves: RHEL-36430 --- qt6-qttools.spec | 13 +++++++++++-- rpminspect.yaml | 7 +++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 rpminspect.yaml diff --git a/qt6-qttools.spec b/qt6-qttools.spec index df6682f..1cdff0c 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -11,7 +11,7 @@ Summary: Qt6 - QtTool components Name: qt6-qttools Version: 6.7.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -92,6 +92,7 @@ Requires: %{name}-common = %{version}-%{release} %package libs-designercomponents Summary: Qt6 Designer Components runtime library Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} %description libs-designercomponents %{summary}. @@ -104,6 +105,7 @@ Requires: %{name}-common = %{version}-%{release} %package -n qt6-assistant Summary: Documentation browser for Qt6 Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %description -n qt6-assistant %{summary}. @@ -116,6 +118,7 @@ Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release} %package -n qt6-linguist Summary: Qt6 Linguist Tools +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} %description -n qt6-linguist Tools to add translations to Qt6 applications. @@ -130,6 +133,7 @@ and invoke methods on those objects. %package -n qt6-doctools Summary: Qt6 doc tools package +Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %description -n qt6-doctools %{summary}. @@ -137,6 +141,7 @@ Summary: Qt6 doc tools package %package examples Summary: Programming examples for %{name} Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %description examples %{summary}. %endif @@ -145,7 +150,7 @@ Requires: %{name}-common = %{version}-%{release} %package tests Summary: Unit tests for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} - +Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %description tests %{summary}. %endif @@ -389,6 +394,10 @@ popd %endif %changelog +* Tue Jun 04 2024 Jan Grulich - 6.7.1-2 +- Add rpminspect.yaml and fix dependencies + Resolves: RHEL-36430 + * Fri May 31 2024 Jan Grulich - 6.7.1-1 - 6.7.1 Resolves: RHEL-36430 diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..b5b09ef --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,7 @@ +--- +ignore: + - '/usr/lib*/qt6/tests/*' +annocheck: + ignore: + - '/usr/lib*/qt6/examples/*' +