Accepting request 841822 from KDE:Frameworks5

OBS-URL: https://build.opensuse.org/request/show/841822
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=148

plasma5-workspace.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Oct 14 17:22:00 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Generate plasmafullwayland.desktop by editing plasmawayland.desktop
+- Make plasma5-session-wayland arch-dependent as it contains %{_libdir}
+- Add BuildRequires for pipewire and libdrm
+
+-------------------------------------------------------------------
+Wed Oct 14 05:59:25 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Don't use %fdupes -s, kpackage doesn't like it and so this broke
+  the slideshow wallpaper
+
 -------------------------------------------------------------------
 Tue Oct 13 10:21:44 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
 

plasma5-workspace.spec

@@ -39,7 +39,6 @@ Source1:        plasma-workspace-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
 Source3:        baselibs.conf
-Source4:        plasmafullwayland.desktop
 # PATCH-FIX-UPSTREAM
 Patch1:         0001-Revert-krdb-Call-xrdb-with-nocpp-to-fix-gitk-runtime.patch
 # PATCHES 501-??? are PATCH-FIX-OPENSUSE
@@ -114,6 +113,10 @@ BuildRequires:  cmake(dbusmenu-qt5)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(libgps)
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libpipewire-0.3)
+%endif
 BuildRequires:  pkgconfig(libqalculate)
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(wayland-client) >= 1.15
@@ -290,7 +293,6 @@ Requires:       libqt5-qtwayland
 Requires:       plasma5-session >= %{version}
 Requires:       xf86-input-libinput
 Requires:       xorg-x11-server-wayland
-BuildArch:      noarch
 
 %description -n plasma5-session-wayland
 This package contains the startup scripts necessary to start a KDE
@@ -328,16 +330,17 @@ Plasma 5 session with Wayland from a display manager.
   ln -s %{_kf5_sharedir}/xsessions/plasma5.desktop %{buildroot}%{_kf5_sharedir}/xsessions/kde-plasma.desktop
 
   # Install custom "full wayland" session
-  install -m0644 %{SOURCE4} %{buildroot}%{_kf5_sharedir}/wayland-sessions/plasmafullwayland.desktop
+  pushd %{buildroot}%{_kf5_sharedir}/wayland-sessions/
+  sed '/^Name/d;s/^Exec=/Exec=env GDK_BACKEND=wayland QT_QPA_PLATFORM=wayland /' plasmawayland.desktop > plasmafullwayland.desktop
+  echo 'Name=Plasma (Full Wayland)' >> plasmafullwayland.desktop
+  popd
 
   mkdir -p %{buildroot}%{_sysconfdir}/alternatives
   touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
   ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
 
-# boo#1175025: remove when it is fixed
+# To work around boo#1175025. Can't use symlinks either, kpackage doesn't like them.
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} < 1550
-  %fdupes -s %{buildroot}/%{_prefix}
-%else
   %fdupes %{buildroot}/%{_prefix}
 %endif
 

plasmafullwayland.desktop

@@ -1,50 +0,0 @@
-[Desktop Entry]
-Exec=env GDK_BACKEND=wayland QT_QPA_PLATFORM=wayland dbus-run-session /usr/bin/startplasma-wayland
-TryExec=/usr/bin/startplasma-wayland
-DesktopNames=KDE
-Name=Plasma (Full Wayland)
-Comment=Plasma by KDE
-Comment[ar]=بلازما كدي
-Comment[bs]=Plazma od strane KDe
-Comment[ca]=Plasma, creat per la comunitat KDE
-Comment[ca@valencia]=Plasma, creat per la comunitat KDE
-Comment[cs]=Plasma z KDE
-Comment[da]=Plasma fra KDE
-Comment[de]=Plasma von KDE
-Comment[el]=Plasma από το KDE
-Comment[en_GB]=Plasma by KDE
-Comment[es]=Plasma, por KDE
-Comment[et]=KDE Plasma
-Comment[eu]=KDEren Plasma
-Comment[fi]=Plasma KDE:ltä
-Comment[fr]=Plasma, par KDE
-Comment[gl]=Plasma, fornecido por KDE.
-Comment[he]=פלזמה באמצעות KDE
-Comment[hu]=Plasma a KDE-től
-Comment[id]=Plasma oleh KDE
-Comment[is]=Plasma frá KDE
-Comment[it]=Plasma di KDE
-Comment[ja]=Plasma by KDE
-Comment[ko]=KDE Plasma
-Comment[lt]=Plasmą sukūrė KDE
-Comment[nb]=Plasma av KDE
-Comment[nds]=Plasma vun KDE
-Comment[nl]=Plasma door KDE
-Comment[nn]=Plasma frå KDE
-Comment[pa]=KDE ਵਲੋਂ ਪਲਾਜ਼ਮਾ
-Comment[pl]=Plazma dzięki KDE
-Comment[pt]=Plasma do KDE
-Comment[pt_BR]=Plasma do KDE
-Comment[ru]=KDE Plasma
-Comment[sk]=Plasma od KDE
-Comment[sl]=KDE Plasma
-Comment[sr]=Плазма од КДЕ‑а
-Comment[sr@ijekavian]=Плазма од КДЕ‑а
-Comment[sr@ijekavianlatin]=Plasma od KDE‑a
-Comment[sr@latin]=Plasma od KDE‑a
-Comment[sv]=Plasma av KDE
-Comment[tr]=KDE Plasma
-Comment[uk]=Плазма KDE
-Comment[x-test]=xxPlasma by KDExx
-Comment[zh_CN]=KDE Plasma
-Comment[zh_TW]=Plasma by KDE