diff --git a/desktop-base-kde.spec b/desktop-base-kde.spec index 2e82838..6c4ac18 100644 --- a/desktop-base-kde.spec +++ b/desktop-base-kde.spec @@ -14,7 +14,7 @@ Name: desktop-base-kde Version: 4.0.6 -Release: 11mamba +Release: 13mamba Summary: KDE default desktop theme and menu entries for openmamba Group: Graphical Desktop/Applications/Environment Vendor: openmamba @@ -25,9 +25,7 @@ Source: http://gitlab.mambasoft.it/openmamba/desktop-base-kde4.git/%{vers License: GPL ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END -%ifnarch aarch64 BuildRequires: kdelibs4-devel -%endif BuildRequires: rpm-macros-kde5 Requires: /usr/bin/strip Requires: openmamba-release @@ -74,11 +72,15 @@ Requires: kwayland-integration Requires: kwrite Requires: kwrited Requires: plasma-browser-integration +Requires: kwin Requires: plasma-workspace Requires: plasma-workspace-wallpapers Requires: plasma-nm Requires: plasma-pk-updates Requires: plasma-thunderbolt +Requires: plasma-disks +Requires: plasma-pa +Requires: plasma-vault Requires: plymouth-kcm Requires: print-manager Requires: phonon-qt5-backend-gstreamer @@ -238,7 +240,6 @@ openmamba milestone3 default wallpaper. #install -d %{buildroot}%{_datadir}/icons #ln -s breeze_cursors %{buildroot}%{_datadir}/icons/default -%ifnarch aarch64 ln -s %{_kde4_libexecdir}/kdesu %{buildroot}%{_kde4_bindir}/kdesu # kde4 <-> kde5 legacy symlinks @@ -248,7 +249,6 @@ for f in %{buildroot}%{_kde5_configdir}/*; do done rm %{buildroot}%{_kde4_datadir}/plasma-desktop/init/10-openmamba-default-setup.js -%endif #find %{buildroot}%{_kde5_datadir}/ -mindepth 1 -maxdepth 1 -type d | while read f; do # b=`basename $f` @@ -262,11 +262,6 @@ rm %{buildroot}%{_kde4_datadir}/plasma-desktop/init/10-openmamba-default-setup.j rm -f %{buildroot}%{_sysconfdir}/pam.d/kde rm -f %{buildroot}%{_sysconfdir}/pam.d/kde-np -%ifarch aarch64 -rm -rf %{buildroot}/share -rm -rf %{buildroot}/bin -%endif - %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -302,25 +297,22 @@ exit 0 %files %defattr(-,root,root) -%attr(0440,root,root) %{_sysconfdir}/sudoers.d/kde4 %config %{_kde5_configdir}/* %{_bindir}/kde5-migrate-user-conf -%ifnarch aarch64 +%{_kde5_datadir}/konqueror/profiles/resourcesbrowsing +%{_kde5_datadir}/color-schemes/OpenmambaGreen.colors +%{_kde5_datadir}/konsole/openmamba.profile + +%files 4 +%defattr(-,root,root) +%attr(0440,root,root) %{_sysconfdir}/sudoers.d/kde4 +%{_kde4_configdir}/* %{_kde4_bindir}/kickoffcfg #%{_datadir}/icons/default %{_kde4_bindir}/kdesu %{_kde4_autostartdir}/mambatray.desktop %{_kde4_autostartdir}/kde5-migrate-user-conf.desktop %{_kde4_autostartdir}/kickoff-autoupdate.desktop -%endif -%{_kde5_datadir}/konqueror/profiles/resourcesbrowsing -%{_kde5_datadir}/color-schemes/OpenmambaGreen.colors -%{_kde5_datadir}/konsole/openmamba.profile - -%ifnarch aarch64 -%files 4 -%defattr(-,root,root) -%{_kde4_configdir}/* #%dir %{_kde4_datadir}/plasma-desktop/init #%{_kde4_datadir}/plasma-desktop/init/* %dir %{_kde4_datadir}/plasma-desktop/updates @@ -331,7 +323,6 @@ exit 0 %dir %{_kde4_datadir}/desktoptheme %dir %{_kde4_datadir}/desktoptheme/openmamba %{_kde4_datadir}/desktoptheme/openmamba/* -%endif %files -n openmamba-wallpaper-bamboo %defattr(-,root,root) @@ -342,6 +333,12 @@ exit 0 %{_datadir}/wallpapers/openmamba_Circles %changelog +* Wed Feb 24 2021 Silvan Calarco 4.0.6-13mamba +- move more kde4 files to -4 subpackage + +* Tue Feb 23 2021 Silvan Calarco 4.0.6-12mamba +- require kwin (removed requirement from plasma-workspace), plasma-pa, plasma-vault, plasma-disks + * Wed Oct 21 2020 Silvan Calarco 4.0.6-11mamba - require oxygen (for sounds)