diff --git a/.gitignore b/.gitignore index f955bdb..7be2994 100644 --- a/.gitignore +++ b/.gitignore @@ -98,4 +98,16 @@ /kwin-5.24.3.tar.xz /kwin-5.24.4.tar.xz /kwin-5.24.5.tar.xz -/kwin-5.24.6.tar.xz +/kwin-5.24.90.tar.xz +/kwin-5.25.0.tar.xz +/kwin-5.25.1.tar.xz +/kwin-5.25.2.tar.xz +/kwin-5.25.3.tar.xz +/kwin-5.25.4.tar.xz +/kwin-5.25.5.tar.xz +/kwin-5.25.90.tar.xz +/kwin-5.26.0.tar.xz +/kwin-5.26.1.tar.xz +/kwin-5.26.2.1.tar.xz +/kwin-5.26.3.tar.xz +/kwin-5.26.4.tar.xz diff --git a/kwin.spec b/kwin.spec index 77354f5..9ee9741 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,7 +16,7 @@ %endif Name: kwin -Version: 5.24.6 +Version: 5.26.4 Release: 1%{?dist} Summary: KDE Window manager @@ -58,14 +58,13 @@ BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtwayland-devel # X11/OpenGL -## libxcvt is only needed for xwayland 22+, not in RHEL yet -%if 0%{?fedora} BuildRequires: pkgconfig(libxcvt) -%endif BuildRequires: mesa-libGL-devel BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libgbm-devel BuildRequires: libxkbcommon-devel +# Uncomment for > 5.27.0 release as it's a new dependency +#BuildRequires: libxkbcommon-x11-devel BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libxcb-devel @@ -124,7 +123,6 @@ BuildRequires: kdecoration-devel >= %{majmin_ver} BuildRequires: kscreenlocker-devel >= %{majmin_ver} BuildRequires: plasma-breeze-devel >= %{majmin_ver} BuildRequires: plasma-wayland-protocols-devel -BuildRequires: kwayland-server-devel >= %{majmin_ver} %if 0%{?tests} BuildRequires: dbus-x11 @@ -177,7 +175,6 @@ Summary: KDE Window Manager with Wayland support Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-common%{?_isa} = %{version}-%{release} Requires: kwayland-integration%{?_isa} >= %{majmin_ver} -Requires: kwayland-server%{?_isa} >= %{majmin_ver} %if ! 0%{?bootstrap} BuildRequires: xorg-x11-server-Xwayland %endif @@ -185,7 +182,7 @@ Requires: xorg-x11-server-Xwayland # http://bugzilla.redhat.com/605675 Provides: firstboot(windowmanager) = kwin_wayland # KWinQpaPlugin (and others?) -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} + # libkdeinit5_kwin* %{?kf5_kinit_requires} # Obsolete kwin-wayland-nvidia package as this is now done automatically @@ -206,7 +203,7 @@ Requires: xorg-x11-server-Xorg # http://bugzilla.redhat.com/605675 Provides: firstboot(windowmanager) = kwin_x11 # KWinX11Platform (and others?) -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} + # libkdeinit5_kwin* %{?kf5_kinit_requires} %description x11 @@ -215,7 +212,7 @@ Provides: firstboot(windowmanager) = kwin_x11 %package common Summary: Common files for KWin X11 and KWin Wayland Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: kf5-kwayland%{?_isa} >= %{_kf5_version} +Requires: kf5-kwayland%{?_isa} >= 5.91.0 # Split of X11 variant into subpackage Obsoletes: %{name}-common < 5.19.5-3 %description common @@ -294,13 +291,14 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %files common -f kwin5.lang %{_datadir}/kwin -%{_kf5_qtplugindir}/*.so +%{_kf5_qtplugindir}/plasma/kcms/systemsettings/*.so +%{_kf5_qtplugindir}/plasma/kcms/systemsettings_qwidgets/*.so %{_kf5_qtplugindir}/kwin/ -%{_kf5_qtplugindir}/kcms/ %{_kf5_qtplugindir}/kpackage/packagestructure/ %{_kf5_qtplugindir}/org.kde.kdecoration2/*.so -%dir %{_kf5_qtplugindir}/org.kde.kwin.platforms %{_qt5_qmldir}/org/kde/kwin +%{_qt5_qmldir}/org/kde/kwin.2/qmldir +%{_qt5_qmldir}/org/kde/kwin.2/DesktopThumbnailItem.qml %{_kf5_libdir}/kconf_update_bin/kwin5_update_default_rules %{_libexecdir}/kwin_killer_helper %{_libexecdir}/kwin_rules_dialog @@ -316,7 +314,6 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %{_datadir}/kconf_update/kwin-5.23-remove-flip-switch.py %{_datadir}/kconf_update/kwin-5.23-remove-xrender-backend.py %{_datadir}/kconf_update/kwinrules-5.23-virtual-desktop-ids.py -%{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/kservices5/kwin %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_datadir}/kpackage/kcms/kcm_* @@ -327,24 +324,19 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %{_kf5_datadir}/config.kcfg/kwin_colorcorrect.kcfg %{_kf5_datadir}/kconf_update/kwinrules-5.19-placement.pl %{_kf5_datadir}/kconf_update/kwinrules.upd +%{_kf5_datadir}/kconf_update/kwin-5.25-effect-pluginid-config-group.py %{_datadir}/icons/hicolor/*/apps/kwin.* %{_datadir}/knsrcfiles/*.knsrc %{_datadir}/krunner/dbusplugins/kwin-runner-windows.desktop -%{_datadir}/applications/org.kde.kwin_rules_dialog.desktop +%{_datadir}/applications/*.desktop %files wayland %{_bindir}/kwin_wayland_wrapper %{_kf5_bindir}/kwin_wayland -%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandDrmBackend.so -%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandFbdevBackend.so -%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandWaylandBackend.so -%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandX11Backend.so -%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandVirtualBackend.so %{_userunitdir}/plasma-kwin_wayland.service %files x11 %{_kf5_bindir}/kwin_x11 -%{_kf5_qtplugindir}/org.kde.kwin.platforms/KWinX11Platform.so %{_userunitdir}/plasma-kwin_x11.service %ldconfig_scriptlets libs @@ -352,17 +344,14 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %files libs %{_kf5_datadir}/qlogging-categories5/org_kde_kwin.categories %{_libdir}/libkwin.so.* -%{_libdir}/libkwinxrenderutils.so.* %{_libdir}/libkwineffects.so.* %{_libdir}/libkwinglutils.so.* %{_libdir}/libkcmkwincommon.so.* -%{_qt5_plugindir}/kcms/kcm_kwin_virtualdesktops.so %files devel %{_datadir}/dbus-1/interfaces/*.xml %{_libdir}/cmake/KWinDBusInterface %{_libdir}/cmake/KWinEffects -%{_libdir}/libkwinxrenderutils.so %{_libdir}/libkwineffects.so %{_libdir}/libkwinglutils.so %{_includedir}/kwin*.h @@ -372,11 +361,54 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog -* Wed Jul 13 2022 Troy Dawson - 5.24.6-1 -- Update to 5.24.6 +* Tue Nov 29 2022 Marc Deop - 5.26.4-1 +- 5.26.4 + +* Wed Nov 09 2022 Marc Deop - 5.26.3-1 +- 5.26.3 + +* Wed Oct 26 2022 Marc Deop - 5.26.2-1 +- 5.26.2 + +* Tue Oct 18 2022 Marc Deop - 5.26.1-1 +- 5.26.1 + +* Thu Oct 06 2022 Marc Deop - 5.26.0-1 +- 5.26.0 + +* Sat Sep 17 2022 Marc Deop - 5.25.90-1 +- 5.25.90 + +* Wed Sep 07 2022 Marc Deop - 5.25.5-1 +- 5.25.5 + +* Wed Aug 03 2022 Justin Zobel - 5.25.4-1 +- Update to 5.25.4 -* Mon Jun 20 2022 Troy Dawson - 5.24.5-1 -- Do not require libxcvt for RHEL +* Thu Jul 21 2022 Fedora Release Engineering - 5.25.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 14 2022 Jan Grulich - 5.25.3-2 +- Rebuild (qt5) + +* Tue Jul 12 2022 Marc Deop - 5.25.3-1 +- 5.25.3 + +* Tue Jun 28 2022 Marc Deop - 5.25.2-1 +- 5.25.2 + +* Tue Jun 21 2022 Marc Deop - 5.25.1-1 +- 5.25.1 + +* Thu Jun 09 2022 Marc Deop - 5.25.0-1 +- 5.25.0 + +* Fri May 20 2022 Marc Deop - 5.24.90-1 +- 5.24.90 +- remove kwayland-server dependency + +* Tue May 17 2022 Jan Grulich - 5.24.5-2 +- Rebuild (qt5) * Tue May 03 2022 Marc Deop - 5.24.5-1 - 5.24.5 diff --git a/sources b/sources index b45a940..da3c2dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.24.6.tar.xz) = 582464134046c672f9dd798a5485eb2ea93c71676ad20aebda60d978d459104e74fe1283cb0e16968216faf53827dc3e47d669d4c977e0fb7a5a4bb408f77eeb +SHA512 (kwin-5.26.4.tar.xz) = 723ec98171b43aadb8b688d6c852ad4c45282b44f7f5706066464659ca5025b2611eb087067fddc1eed42e2c48e2bcdbe9a24319909aa15b818f40b19621a0b2