diff --git a/openmambaLookAndFeel.sh b/openmambaLookAndFeel.sh new file mode 100644 index 0000000..2fc3b75 --- /dev/null +++ b/openmambaLookAndFeel.sh @@ -0,0 +1,2 @@ +#!/bin/bash +/usr/bin/lookandfeeltool -a org.openmamba.light.desktop diff --git a/openmambaLookAndFeel.upd b/openmambaLookAndFeel.upd new file mode 100644 index 0000000..3be9e4b --- /dev/null +++ b/openmambaLookAndFeel.upd @@ -0,0 +1,3 @@ +Version=5 +Id=openmambaLookAndFeel +Script=openmambaLookAndFeel.sh diff --git a/plasma-workspace.spec b/plasma-workspace.spec index b77643a..d9a98a6 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -2,7 +2,7 @@ Name: plasma-workspace Version: 5.25.2 -Release: 3mamba +Release: 5mamba Summary: KDE Frameworks 5 Workspace Group: Graphical Desktop/Applications/Environment Vendor: openmamba @@ -15,6 +15,8 @@ Source2: plasma-workspace-pam-no-password Source3: openmamba.plasma.logo.png Source4: openmamba.desktop Source5: openmamba-dark.desktop +Source6: openmambaLookAndFeel.upd +Source7: openmambaLookAndFeel.sh Patch0: plasma-workspace-5.19.4-gpsd-3.21.patch License: GPL ## AUTOBUILDREQ-BEGIN @@ -121,6 +123,7 @@ BuildRequires: libkwin-devel %endif BuildRequires: kscreenlocker BuildRequires: libkquickcharts-devel +Requires: accountsservice Requires: kscreenlocker Requires: ksysguard Requires: milou @@ -160,6 +163,14 @@ Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} %description -n lib%{name}-devel This package contains libraries and header files for developing applications that use %{name}. +%package -n plasma-lookandfeel-breeze +Group: Graphical Desktop/Look 'n' feel +Summary: Breeze default theme for KDE Plasma +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description -n plasma-lookandfeel-breeze +Breeze default theme for KDE Plasma. + %package -n plasma-lookandfeel-openmamba Group: Graphical Desktop/Look 'n' feel Summary: openmamba theme for KDE Plasma @@ -174,9 +185,8 @@ openmamba theme for KDE Plasma. %debug_package %prep -%setup -q -#-D -T -#:<< _EOF +%setup -q -D -T +:<< _EOF #%patch0 -p1 # From Fedora @@ -202,7 +212,7 @@ plasma_install_package(lookandfeel.openmamba.dark org.openmamba.dark.desktop loo EOL %build -#:<< _EOF +:<< _EOF %cmake_kde5 -d build %make @@ -270,6 +280,9 @@ cat > %{buildroot}%{_sysconfdir}/xdg/kdeglobals << _EOF LookAndFeelPackage=org.openmamba.light.desktop _EOF +install -D -m0644 %{SOURCE6} %{buildroot}%{_datadir}/kconf_update/openmambaLookAndFeel.upd +install -D -m0755 %{SOURCE7} %{buildroot}%{_datadir}/kconf_update/openmambaLookAndFeel.sh + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -294,7 +307,6 @@ _EOF %{_bindir}/kde-systemd-start-condition %{_bindir}/kfontinst %{_bindir}/kfontview -#%{_bindir}/krdb %{_bindir}/lookandfeeltool %{_bindir}/plasmashell %{_bindir}/plasma-apply-* @@ -339,10 +351,6 @@ _EOF %dir %{_datadir}/plasma/avatars %{_datadir}/plasma/avatars/* %dir %{_datadir}/plasma/look-and-feel -%dir %{_datadir}/plasma/look-and-feel/org.kde.breeze.desktop -%{_datadir}/plasma/look-and-feel/org.kde.breeze.desktop/* -%{_datadir}/plasma/look-and-feel/org.kde.breezedark.desktop/* -%{_datadir}/plasma/look-and-feel/org.kde.breezetwilight.desktop/* %dir %{_datadir}/plasma/plasmoids %{_datadir}/plasma/plasmoids/* %dir %{_datadir}/plasma/services @@ -453,6 +461,13 @@ _EOF %dir %{_libdir}/cmake/LibColorCorrect %{_libdir}/cmake/LibColorCorrect/LibColorCorrect*.cmake +%files -n plasma-lookandfeel-breeze +%defattr(-,root,root) +%dir %{_datadir}/plasma/look-and-feel/org.kde.breeze.desktop +%{_datadir}/plasma/look-and-feel/org.kde.breeze.desktop/* +%{_datadir}/plasma/look-and-feel/org.kde.breezedark.desktop/* +%{_datadir}/plasma/look-and-feel/org.kde.breezetwilight.desktop/* + %files -n plasma-lookandfeel-openmamba %defattr(-,root,root) %{_sysconfdir}/xdg/kdeglobals @@ -462,11 +477,19 @@ _EOF %{_datadir}/plasma/look-and-feel/org.openmamba.light.desktop/* %dir %{_datadir}/plasma/look-and-feel/org.openmamba.dark.desktop %{_datadir}/plasma/look-and-feel/org.openmamba.dark.desktop/* +%{_datadir}/kconf_update/openmambaLookAndFeel.* %{_prefix}/lib/sddm/sddm.conf.d/zz_openmamba.conf %dir %{_datadir}/sddm/themes/openmamba %{_datadir}/sddm/themes/openmamba/* %changelog +* Sun Jul 10 2022 Silvan Calarco 5.25.2-5mamba +- move required plasma wallpapers components back to plasma-workspace + +* Sun Jul 10 2022 Silvan Calarco 5.25.2-4mamba +- require accountsservice to fix kcm_users +- plasma-lookandfeel-openmamba: install kconf_update script to apply custom theme + * Sun Jul 03 2022 Silvan Calarco 5.25.2-3mamba - set openmamba color-schemes with upper case initial letter as required to work