diff --git a/dde-kwin.spec b/dde-kwin.spec index 6bf6b99933d3d563f3b546257b94192ec2e2a253..75becaebc2d3470959da53b364b9ae6ef20553d3 100644 --- a/dde-kwin.spec +++ b/dde-kwin.spec @@ -1,5 +1,5 @@ %global repo dde-kwin -%define pkgrelease 1 +%define pkgrelease 2 %if 0%{?openeuler} %define specrelease %{pkgrelease} %else @@ -47,17 +47,21 @@ BuildRequires: kf5-kglobalaccel-devel BuildRequires: cmake(KDecoration2) BuildRequires: cmake(KF5I18n) BuildRequires: qt5-linguist -%if %{kwin_ext} +BuildRequires: kf5-kdeclarative-devel +BuildRequires: kf5-kservice-devel +BuildRequires: kf5-plasma-devel +BuildRequires: kdecoration-devel +BuildRequires: kf5-ktextwidgets-devel + + # for libQt5EdidSupport.a BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtdeclarative-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: dde-qt5integration%{?_isa} -Requires: kwin-x11%{?_isa} >= 5.21 -%else -Requires: %{_bindir}/kwin_x11 -%endif +Requires: kwin%{?_isa} >= 5.21 + # since F31 Obsoletes: deepin-wm <= 1.9.38 Obsoletes: deepin-wm-switcher <= 1.1.9 @@ -66,6 +70,13 @@ Obsoletes: deepin-metacity-devel <= 3.22.24 Obsoletes: deepin-mutter <= 3.20.38 Obsoletes: deepin-mutter-devel <= 3.20.38 +Requires: kf5-kconfig-core +Requires: kf5-kcoreaddons +Requires: kf5-kglobalaccel-libs +Requires: kf5-ki18n +Requires: kf5-kwindowsystem +Requires: kdecoration + %description This package provides a kwin configuration that used as the new WM for Deepin Desktop Environment. @@ -104,9 +115,7 @@ export PATH=%{_qt5_bindir}:$PATH -DENABLE_BUILTIN_MULTITASKING=OFF \ -DENABLE_BUILTIN_BLACK_SCREEN=OFF \ -DUSE_DEEPIN_WAYLAND=OFF \ -%if !%{kwin_ext} -DUSE_PLUGINS=OFF -%endif %make_build @@ -139,6 +148,9 @@ export PATH=%{_qt5_bindir}:$PATH %endif %changelog +* Tue Aug 02 2022 liweiganga - 5.4.26-2 +- modify requires + * Mon Jul 25 2022 konglidong - 5.4.26-1 - update to 5.4.26