diff --git a/.gitignore b/.gitignore index 0900d2e..b81540f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /plasma-workspace-5.12.0.tar.xz /plasma-workspace-5.12.1.tar.xz /plasma-workspace-5.12.2.tar.xz +/plasma-workspace-5.12.3.tar.xz diff --git a/plasma-workspace-5.12.3-plasmawayland_session.patch b/plasma-workspace-5.12.3-plasmawayland_session.patch new file mode 100644 index 0000000..d2cdbda --- /dev/null +++ b/plasma-workspace-5.12.3-plasmawayland_session.patch @@ -0,0 +1,11 @@ +diff -up plasma-workspace-5.12.3/plasmawayland.desktop.cmake.plasmawayland2 plasma-workspace-5.12.3/plasmawayland.desktop.cmake +--- plasma-workspace-5.12.3/plasmawayland.desktop.cmake.plasmawayland2 2018-03-06 07:01:06.000000000 -0600 ++++ plasma-workspace-5.12.3/plasmawayland.desktop.cmake 2018-03-06 11:35:48.567226903 -0600 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 +-Exec=dbus-launch --exit-with-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor ++Exec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor + TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor + DesktopNames=KDE + Name=Plasma diff --git a/plasma-workspace.spec b/plasma-workspace.spec index d9b8a3e..a28d4e9 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -6,7 +6,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.12.2 +Version: 5.12.3 Release: 1%{?dist} License: GPLv2+ @@ -39,6 +39,8 @@ Patch100: plasma-workspace-5.7.95-konsole-in-contextmenu.patch Patch101: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch # remove stuff we don't want or need, plus a minor bit of customization --rex Patch102: startkde.patch +# fix plasmawayland to not explicitly launch dbus (it should autospawn) +Patch103: plasma-workspace-5.12.3-plasmawayland_session.patch # default to folderview (instead of desktop) containment, see also # https://mail.kde.org/pipermail/distributions/2016-July/000133.html # and example, @@ -368,6 +370,7 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee shell/packageplugins/lookandfeel/lookandfeel.cpp %endif %patch102 -p1 -b .startkde +%patch103 -p1 -b .plasmawayland_session %patch105 -p1 %if 0%{?fedora} @@ -389,7 +392,7 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%build_build -C %{_target_platform} %install @@ -493,14 +496,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %files doc -f %{name}-doc.lang -%post -n libkworkspace5 -p /sbin/ldconfig -%postun -n libkworkspace5 -p /sbin/ldconfig +%ldconfig_scriptlets -n libkworkspace5 %files -n libkworkspace5 -f libkworkspace5.lang %{_libdir}/libkworkspace5.so.5* -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files libs %{_sysconfdir}/xdg/taskmanagerrulesrc @@ -534,8 +535,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %{_kf5_datadir}/kservices5/plasma-geolocation-ip.desktop %{_kf5_datadir}/kservicetypes5/plasma-geolocationprovider.desktop -%post geolocation-libs -p /sbin/ldconfig -%postun geolocation-libs -p /sbin/ldconfig +%ldconfig_scriptlets geolocation-libs %files geolocation-libs %{_libdir}/libplasma-geolocation-interface.so.5* @@ -577,6 +577,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %changelog +* Tue Mar 06 2018 Rex Dieter - 5.12.3-1 +- 5.13.3 +- plasmawayland session: drop explcitly running dbus_launch +- use %%make_build %%ldconfig_scriptlets + * Wed Feb 21 2018 Jan Grulich - 5.12.2-1 - 5.12.2 diff --git a/sources b/sources index cdc24da..09aaaee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plasma-workspace-5.12.2.tar.xz) = 5e4d5386e1d4fc0fa81303c22b1570da8b6d82f8cf47a7137f7edbe1647ad5575ce36465010a7433183e29f4704cb17a40ff869d7df7d6706ba35ccc79bd190e SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 +SHA512 (plasma-workspace-5.12.3.tar.xz) = 0f00b1e14d5dc5b5763dbfa5aff4de74a2bbf3a44e2932f1916de525c3caf60d0a11e611cb2b0bcc31ff502991595808ff2728772dec787e91974700da234f53