From faa70249bfee0c6c2a150dae42c29355d43e4750 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 18 Nov 2021 08:16:41 +0100 Subject: [PATCH 1/3] Rebuild (qt6) --- adwaita-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adwaita-qt.spec b/adwaita-qt.spec index b353e9f..a9a5c34 100644 --- a/adwaita-qt.spec +++ b/adwaita-qt.spec @@ -4,7 +4,7 @@ ExcludeArch: s390x Name: adwaita-qt Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ Summary: Adwaita theme for Qt-based applications @@ -124,6 +124,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig/adwaita-qt6.pc %{_libdir}/libadwaitaqt6priv.so %changelog +* Thu Nov 18 2021 Jan Grulich - 1.4.1-2 +- Rebuild (qt6) + * Wed Nov 10 2021 Jan Grulich - 1.4.1-1 - 1.4.1 + Add Qt6 version From a4b34240931b44e8b91672be452cd17d0624b309 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 5 Mar 2022 13:56:19 -0500 Subject: [PATCH 2/3] Allow s390x builds again now that qt6-qtdeclarative works on s390x --- adwaita-qt.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/adwaita-qt.spec b/adwaita-qt.spec index a9a5c34..d00e343 100644 --- a/adwaita-qt.spec +++ b/adwaita-qt.spec @@ -1,7 +1,3 @@ -# FIXME: qt6-qtdeclarative doesn't build on S390x -# BUG: https://bugreports.qt.io/browse/QTBUG-93101 -ExcludeArch: s390x - Name: adwaita-qt Version: 1.4.1 Release: 2%{?dist} From 2c545391ccbcff225ccc712cf332084e4463b544 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 5 Mar 2022 13:58:48 -0500 Subject: [PATCH 3/3] Small cleanups to the packaging --- adwaita-qt.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/adwaita-qt.spec b/adwaita-qt.spec index d00e343..277fcbb 100644 --- a/adwaita-qt.spec +++ b/adwaita-qt.spec @@ -1,6 +1,6 @@ Name: adwaita-qt Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ Summary: Adwaita theme for Qt-based applications @@ -9,23 +9,22 @@ Source0: https://github.com/FedoraQt/adwaita-qt/archive/%{version}/adwait BuildRequires: cmake -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtx11extras-devel - -BuildRequires: qt6-qtbase-devel - BuildRequires: libxcb-devel Obsoletes: adwaita-qt4 < 1.1.90 Obsoletes: adwaita-qt-common < 1.1.90 -Requires: adwaita-qt5 +Requires: (adwaita-qt5 if qt5-qtbase) +Requires: (adwaita-qt6 if qt6-qtbase) %description Theme to let Qt applications fit nicely into Fedora Workstation %package -n adwaita-qt5 Summary: Adwaita Qt5 theme +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel + Requires: libadwaita-qt5%{?_isa} = %{version}-%{release} %description -n adwaita-qt5 @@ -47,6 +46,8 @@ developing applications that use libadwaita-qt5. %package -n adwaita-qt6 Summary: Adwaita Qt6 theme +BuildRequires: qt6-qtbase-devel + Requires: libadwaita-qt6%{?_isa} = %{version}-%{release} %description -n adwaita-qt6 @@ -120,6 +121,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig/adwaita-qt6.pc %{_libdir}/libadwaitaqt6priv.so %changelog +* Sat Mar 05 2022 Neal Gompa - 1.4.1-3 +- Small cleanups to the packaging + * Thu Nov 18 2021 Jan Grulich - 1.4.1-2 - Rebuild (qt6)