diff --git a/1.4.2.tar.gz b/1.4.2.tar.gz new file mode 100644 index 0000000..377fe77 Binary files /dev/null and b/1.4.2.tar.gz differ diff --git a/adwaita-qt-1.1.0.tar.gz b/adwaita-qt-1.1.0.tar.gz deleted file mode 100644 index a68aa96..0000000 Binary files a/adwaita-qt-1.1.0.tar.gz and /dev/null differ diff --git a/adwaita-qt.spec b/adwaita-qt.spec index ae63524..e92d2a7 100644 --- a/adwaita-qt.spec +++ b/adwaita-qt.spec @@ -1,58 +1,124 @@ Name: adwaita-qt -Version: 1.1.0 -Release: 7 +Version: 1.4.2 +Release: 1 License: GPL-2.0 and GPL-2.0+ -Summary: A native style to bend Qt4 and Qt5 applications +Summary: Adwaita theme for Qt-based applications Url: https://github.com/FedoraQt/adwaita-qt -Source0: https://github.com/FedoraQt/adwaita-qt/archive/%{version}/adwaita-qt-%{version}.tar.gz -Patch0: adwaita-qt-upstream-fixes.patch -BuildRequires: cmake qt4-devel qt5-qtbase-devel -Requires: adwaita-qt4 +Source0: https://github.com/FedoraQt/adwaita-qt/archive/refs/tags/%{version}.tar.gz + +BuildRequires: cmake libxcb-devel %description -A native style to bend Qt4 and Qt5 applications to look like they belong -into GNOME Shell. +A native style to bend Qt5/Qt6 applications to look like they belong into GNOME Shell. -%package devel -Summary: Adwaita theme variant and common files for adwaita-qt -Provides: adwaita-qt4 = %{version}-%{release} adwaita-qt5 = %{version}-%{release} -Provides: adwaita-qt-common = %{version}-%{release} -Obsoletes: adwaita-qt4 < %{version}-%{release} adwaita-qt5 < %{version}-%{release} -Obsoletes: adwaita-qt-common < %{version}-%{release} +%package -n adwaita-qt5 +Summary: Adwaita Qt5 theme +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel -%description devel -Adwaita theme variant for applications utilizing Qt4 and Qt5, -and common files for adwaita-qt. +Requires: libadwaita-qt5%{?_isa} = %{version}-%{release} + +%description -n adwaita-qt5 +Adwaita theme variant for applications utilizing Qt5. + +%package -n libadwaita-qt5 +Summary: Adwaita Qt5 library + +%description -n libadwaita-qt5 +%{summary}. + +%package -n libadwaita-qt5-devel +Summary: Development files for libadwaita-qt5 +Requires: libadwaita-qt5%{?_isa} = %{version}-%{release} + +%description -n libadwaita-qt5-devel +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 +BuildRequires: qt6-qtbase-devel + +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 -install -d "%{_target_platform}-qt4" -cd "%{_target_platform}-qt4" -%{cmake} -DUSE_QT4=true .. -cd .. +%global _vpath_builddir %{_target_platform}-qt5 +%cmake -B "%{_vpath_builddir}" +%__cmake --build "%{_vpath_builddir}" -install -d "%{_target_platform}-qt5" -cd "%{_target_platform}-qt5" -%{cmake} .. -cd .. - -%make_build -C "%{_target_platform}-qt4" -%make_build -C "%{_target_platform}-qt5" +%global _vpath_builddir %{_target_platform}-qt6 +%cmake -B "%{_vpath_builddir}" -DUSE_QT6=true +%__cmake --build "%{_vpath_builddir}" %install -%make_install -C "%{_target_platform}-qt4" -%make_install -C "%{_target_platform}-qt5" +%global _vpath_builddir %{_target_platform}-qt5 +DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" -%files devel -%doc LICENSE.LGPL2 README.md +%global _vpath_builddir %{_target_platform}-qt6 +DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" -%files -%{_qt4_plugindir}/styles/adwaita.so +rm -rf %{buildroot}%{_libdir}/pkgconfig/adwaita-qt6.pc + +%files -n adwaita-qt5 +%doc README.md +%license LICENSE.LGPL2 %{_qt5_plugindir}/styles/adwaita.so +%files -n libadwaita-qt5 +%{_libdir}/libadwaitaqt.so.* +%{_libdir}/libadwaitaqtpriv.so.* + +%files -n libadwaita-qt5-devel +%dir %{_includedir}/AdwaitaQt +%{_includedir}/AdwaitaQt/*.h +%dir %{_libdir}/cmake/AdwaitaQt +%{_libdir}/cmake/AdwaitaQt/*.cmake +%{_libdir}/pkgconfig/adwaita-qt.pc +%{_libdir}/libadwaitaqt.so +%{_libdir}/libadwaitaqtpriv.so + +%files -n adwaita-qt6 +%doc README.md +%license LICENSE.LGPL2 +%{_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/AdwaitaQt6 +%{_libdir}/cmake/AdwaitaQt6/*.cmake +%{_libdir}/libadwaitaqt6.so +%{_libdir}/libadwaitaqt6priv.so + + %changelog +* Tue Nov 21 2023 lwg - 1.4.2-1 +- update to version 1.4.2 + * Fri Jul 07 2023 xu_ping <707078654@qq.com> - 1.1.0-7 - Modify changelog release version diff --git a/adwaita-qt.yaml b/adwaita-qt.yaml index 8502e6a..0bbb6e3 100644 --- a/adwaita-qt.yaml +++ b/adwaita-qt.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: FedoraQt/adwaita-qt tag_prefix: ^ -seperator: . +separator: .