From 8a5f8a07f017aaef8600eb3795f5c6ef5e1878d0 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Mon, 1 Aug 2022 09:36:16 -0700
Subject: [PATCH] Build plasma-lookandfeel-fedora on everything

---
 plasma-workspace.spec | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index ad6fdd4..4392567 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -28,7 +28,7 @@
 Name:    plasma-workspace
 Summary: Plasma workspace, applications and applets
 Version: 5.24.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 URL:     https://invent.kde.org/plasma/%{name}
@@ -261,13 +261,9 @@ Requires:       iceauth xrdb xprop
 Requires:       kde-settings-plasma
 
 # Default look-and-feel theme
-%if 0%{?fedora}
 %global default_lookandfeel org.fedoraproject.fedora.desktop
 Requires:       plasma-lookandfeel-fedora = %{version}-%{release}
-%endif
-%if ! 0%{?default_lookandfeel:1}
 Requires:       desktop-backgrounds-compat
-%endif
 
 Requires:       systemd
 
@@ -397,10 +393,8 @@ Recommends:     qt5-qtvirtualkeyboard
 # org.kde.plasma.workspace.keyboardlayout
 Requires:       %{name} = %{version}-%{release}
 # /usr/share/backgrounds/default.png
-%if 0%{?fedora}
 BuildRequires:  desktop-backgrounds-compat
 Requires:       desktop-backgrounds-compat
-%endif
 %if 0%{?rhel}
 Requires:       system-logos
 %endif
@@ -477,14 +471,11 @@ BuildArch: noarch
 ## downstream patches
 %patch100 -p1 -b .konsole-in-contextmenu
 # XXX: This is horribly broken and needs fixes upstream -- ngompa
-%if 0%{?default_lookandfeel:1}
 %patch101 -p1 -b .set-fedora-default-look-and-feel
 sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfeel:org.kde.breeze.desktop}|g" \
   shell/packageplugins/lookandfeel/lookandfeel.cpp startkde/startplasma.cpp
-%endif
 %patch105 -p1
 
-%if 0%{?fedora}
 # Populate initial lookandfeel package
 cp -a lookandfeel lookandfeel.fedora
 # Overwrite settings to configure twilight mode
@@ -493,7 +484,6 @@ install -m 0644 %{SOURCE15} lookandfeel.fedora/metadata.desktop
 cat >> CMakeLists.txt <<EOL
 plasma_install_package(lookandfeel.fedora org.fedoraproject.fedora.desktop look-and-feel lookandfeel)
 EOL
-%endif
 
 
 %build
@@ -515,12 +505,10 @@ chrpath --delete %{buildroot}%{_kf5_qtplugindir}/phonon_platform/kde.so
 ln -s startplasma-x11 %{buildroot}%{_kf5_bindir}/startkde
 %endif
 
-%if 0%{?fedora}
 # remove/replace items to be customized
 ln -sf \
   %{_datadir}/backgrounds/default.png \
   %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/components/artwork/background.png
-%endif
 
 # make fedora-breeze sddm theme variant.
 cp -alf %{buildroot}%{_datadir}/sddm/themes/breeze/ \
@@ -540,12 +528,10 @@ sed -i -e 's|^logo=.*$|logo=%{_datadir}/pixmaps/fedora_whitelogo.svg|g' %{buildr
 mkdir -p %{buildroot}%{_prefix}/lib/sddm
 mv %{buildroot}%{_sysconfdir}/sddm.conf.d %{buildroot}%{_prefix}/lib/sddm
 
-%if 0%{?fedora} > 30
 ## customize plasma-lookandfeel-fedora defaults
 # from [Wallpaper] Image=Next to Image=Fedora
 sed -i -e 's|^Image=.*$|Image=Fedora|g' \
   %{buildroot}%{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/defaults
-%endif
 
 # Make kcheckpass work
 install -m644 -p -D %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/kde
@@ -795,13 +781,14 @@ fi
 %{_datadir}/xsessions/plasmax11.desktop
 %endif
 
-%if 0%{?fedora}
 %files -n plasma-lookandfeel-fedora
 %{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/
-%endif
 
 
 %changelog
+* Fri Jul 29 2022 Troy Dawson <tdawson@redhat.com> - 5.24.6-2
+- Build plasma-lookandfeel-fedora on everything
+
 * Wed Jul 13 2022 Troy Dawson <tdawson@redhat.com> - 5.24.6-1
 - Update to 5.24.6