update to version 1.4.2

adwaita-qt.spec

@@ -1,58 +1,124 @@
 Name:          adwaita-qt
-Version:       1.1.0
+Version:       1.4.2
-Release:       7
+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
+Source0:       https://github.com/FedoraQt/adwaita-qt/archive/refs/tags/%{version}.tar.gz
-Patch0:        adwaita-qt-upstream-fixes.patch
+
-BuildRequires: cmake qt4-devel qt5-qtbase-devel
+BuildRequires: cmake libxcb-devel
-Requires:      adwaita-qt4
 
 %description
-A native style to bend Qt4 and Qt5 applications to look like they belong
+A native style to bend Qt5/Qt6 applications to look like they belong into GNOME Shell.
-into GNOME Shell.
 
-%package devel
+%package -n adwaita-qt5
-Summary:   Adwaita theme variant and common files for adwaita-qt
+Summary:        Adwaita Qt5 theme
-Provides:  adwaita-qt4 = %{version}-%{release} adwaita-qt5 = %{version}-%{release}
+BuildRequires:  qt5-qtbase-devel
-Provides:  adwaita-qt-common = %{version}-%{release}
+BuildRequires:  qt5-qtx11extras-devel
-Obsoletes: adwaita-qt4 < %{version}-%{release} adwaita-qt5 < %{version}-%{release}
-Obsoletes: adwaita-qt-common < %{version}-%{release}
 
-%description devel
+Requires:       libadwaita-qt5%{?_isa} = %{version}-%{release}
-Adwaita theme variant for applications utilizing Qt4 and Qt5,
+
-and common files for adwaita-qt.
+%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"
+%global _vpath_builddir %{_target_platform}-qt5
-cd "%{_target_platform}-qt4"
+%cmake -B "%{_vpath_builddir}"
-%{cmake} -DUSE_QT4=true ..
+%__cmake --build "%{_vpath_builddir}"
-cd ..
 
-install -d "%{_target_platform}-qt5"
+%global _vpath_builddir %{_target_platform}-qt6
-cd "%{_target_platform}-qt5"
+%cmake -B "%{_vpath_builddir}" -DUSE_QT6=true
-%{cmake} ..
+%__cmake --build "%{_vpath_builddir}"
-cd ..
-
-%make_build -C "%{_target_platform}-qt4"
-%make_build -C "%{_target_platform}-qt5"
 
 %install
-%make_install -C "%{_target_platform}-qt4"
+%global _vpath_builddir %{_target_platform}-qt5
-%make_install -C "%{_target_platform}-qt5"
+DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}"
 
-%files devel
+%global _vpath_builddir %{_target_platform}-qt6
-%doc LICENSE.LGPL2 README.md
+DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}"
 
-%files
+rm -rf %{buildroot}%{_libdir}/pkgconfig/adwaita-qt6.pc
-%{_qt4_plugindir}/styles/adwaita.so
+
+%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 <liweiganga@uniontech.com> - 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
 

adwaita-qt.yaml

@@ -1,4 +1,4 @@
 version_control: github
 src_repo: FedoraQt/adwaita-qt
 tag_prefix: ^
-seperator: .
+separator: .