diff --git a/.gitignore b/.gitignore index 6f1f45f..e49b31e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /adwaita-qt-1.3.0.tar.gz /adwaita-qt-1.3.1.tar.gz /adwaita-qt-1.4.0.tar.gz +/adwaita-qt-1.4.1.tar.gz diff --git a/adwaita-qt.spec b/adwaita-qt.spec index 4111214..e8614fe 100644 --- a/adwaita-qt.spec +++ b/adwaita-qt.spec @@ -1,6 +1,6 @@ Name: adwaita-qt -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} License: LGPLv2+ and GPLv2+ Summary: Adwaita theme for Qt-based applications @@ -13,17 +13,19 @@ 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-qt6 %description Theme to let Qt applications fit nicely into Fedora Workstation -# Use -qt5 naming in case we provide -qt6 version in the future %package -n adwaita-qt5 Summary: Adwaita Qt5 theme Requires: libadwaita-qt5%{?_isa} = %{version}-%{release} @@ -45,17 +47,48 @@ Requires: libadwaita-qt5%{?_isa} = %{version}-%{release} The libadwaita-qt5-devel package contains libraries and header files for developing applications that use libadwaita-qt5. +%package -n adwaita-qt6 +Summary: Adwaita Qt6 theme +Requires: libadwaita-qt6%{?_isa} = %{version}-%{release} + +%description -n adwaita-qt6 +Adwaita theme variant for applications utilizing Qt6. + +%package -n libadwaita-qt6 +Summary: Adwaita Qt6 library + +%description -n libadwaita-qt6 +%{summary}. + +%package -n libadwaita-qt6-devel +Summary: Development files for libadwaita-qt6 +Requires: libadwaita-qt6%{?_isa} = %{version}-%{release} + +%description -n libadwaita-qt6-devel +The libadwaita-qt6-devel package contains libraries and header files for +developing applications that use libadwaita-qt6. + %prep %autosetup -n %{name}-%{version} -p1 %build +%global _vpath_builddir %{_target_platform}-qt5 %cmake +%cmake_build +%global _vpath_builddir %{_target_platform}-qt6 +%cmake -DUSE_QT6=true %cmake_build %install +%global _vpath_builddir %{_target_platform}-qt5 %cmake_install +%global _vpath_builddir %{_target_platform}-qt6 +%cmake_install + +rm -rf %{buildroot}%{_libdir}/pkgconfig/adwaita-qt6.pc + %files -n adwaita-qt5 %doc LICENSE.LGPL2 README.md %{_qt5_plugindir}/styles/adwaita.so @@ -73,7 +106,26 @@ developing applications that use libadwaita-qt5. %{_libdir}/libadwaitaqt.so %{_libdir}/libadwaitaqtpriv.so +%files -n adwaita-qt6 +%{_qt6_plugindir}/styles/adwaita.so + +%files -n libadwaita-qt6 +%{_libdir}/libadwaitaqt6.so.* +%{_libdir}/libadwaitaqt6priv.so.* + +%files -n libadwaita-qt6-devel +%dir %{_includedir}/AdwaitaQt6 +%{_includedir}/AdwaitaQt6/*.h +%dir %{_libdir}/cmake/AdwaitaQt +%{_libdir}/cmake/AdwaitaQt6/*.cmake +%{_libdir}/libadwaitaqt6.so +%{_libdir}/libadwaitaqt6priv.so + %changelog +* Wed Nov 10 2021 Jan Grulich - 1.4.1-1 +- 1.4.1 + + Add Qt6 version + * Tue Aug 24 2021 Jan Grulich - 1.4.0-1 - 1.4.0 diff --git a/sources b/sources index f077d3a..3323795 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (adwaita-qt-1.4.0.tar.gz) = 870076ec219fcaa8d5e24df5076b0dfe147ad2ba4562bccdced03cb0539a49590a59aee8bb029926b36e50d619906974ca70528f835ddc9067e14cdfb0648671 +SHA512 (adwaita-qt-1.4.1.tar.gz) = efdc64addbd2ee4b4eb133323540a2c662cb882e42aa0573dace9044acc7638658badac3581d6cae7a3f17905692e4e8f768b6a8e3c1b4575d7e1999c1e9fe63