From cff004972d11e69df27e964c8882ab042e78e361 Mon Sep 17 00:00:00 2001 From: Jaiden Riordan Date: Wed, 21 Aug 2024 17:23:26 -0500 Subject: [PATCH] switch to plasma branding and custom comp --- comps.xml | 30 ++-- ...conf => ultramarine-plasma-protected.conf} | 0 ...arine-kde.conf => ultramarine-plasma.conf} | 8 +- ultramarine/release/ultramarine-release.spec | 142 +++++++++--------- 4 files changed, 93 insertions(+), 87 deletions(-) rename ultramarine/release/{ultramarine-kde-protected.conf => ultramarine-plasma-protected.conf} (100%) rename ultramarine/release/{ultramarine-kde.conf => ultramarine-plasma.conf} (60%) diff --git a/comps.xml b/comps.xml index 69b1e44..e4520cc 100644 --- a/comps.xml +++ b/comps.xml @@ -163,32 +163,38 @@ - ultramarine-kde-product - Ultramarine KDE product core - Packages mandatory for the Ultramarine KDE product. + ultramarine-plasma-product + Ultramarine Plasma product core + Packages mandatory for the Ultramarine Plasma product. false false kwin-system76-scheduler-integration ultramarine-appstream-metadata - ultramarine-release-kde - ultramarine-release-identity-kde + ultramarine-release-plasma + ultramarine-release-identity-plasma + okular + gwenview + kamoso + kolourpaint + kate + kmail + vlc - ultramarine-kde-product-environment - Ultramarine KDE - Ultramarine KDE is an Ultramarine experience powered by the KDE desktop environment. + ultramarine-plasma-product-environment + Ultramarine plasma + Ultramarine Plasma is an Ultramarine experience powered by the Plasma desktop environment. base-graphical container-management core - standard + standard firefox fonts kde-desktop - kde-apps - kde-media + critical-path-kde guest-desktop-agents hardware-support libreoffice @@ -200,7 +206,7 @@ input-methods ultramarine-product-common ultramarine-desktop-product-common - ultramarine-kde-product + ultramarine-plasma-product diff --git a/ultramarine/release/ultramarine-kde-protected.conf b/ultramarine/release/ultramarine-plasma-protected.conf similarity index 100% rename from ultramarine/release/ultramarine-kde-protected.conf rename to ultramarine/release/ultramarine-plasma-protected.conf diff --git a/ultramarine/release/ultramarine-kde.conf b/ultramarine/release/ultramarine-plasma.conf similarity index 60% rename from ultramarine/release/ultramarine-kde.conf rename to ultramarine/release/ultramarine-plasma.conf index e4625ee..f069ac1 100644 --- a/ultramarine/release/ultramarine-kde.conf +++ b/ultramarine/release/ultramarine-plasma.conf @@ -1,17 +1,17 @@ -# Anaconda profile for Ultramarine Linux KDE +# Anaconda profile for Ultramarine Linux Plasma [Profile] # Define the profile. -profile_id = ultramarine-kde +profile_id = ultramarine-plasma base_profile = ultramarine [Profile Detection] # Match os-release values. os_id = ultramarine -variant_id = kde +variant_id = plasma [Payload] -default_environment = ultramarine-kde-product-environment +default_environment = ultramarine-plasma-product-environment [Bootloader] menu_auto_hide = True diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 6b38d68..5d8bdcf 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -20,20 +20,20 @@ %bcond_without basic %bcond_without flagship -%bcond_without kde +%bcond_without plasma %bcond_without gnome %bcond_without xfce %bcond_without atomic_flagship -%bcond_without atomic_kde +%bcond_without atomic_plasma %bcond_without atomic_gnome %bcond_without atomic_xfce %bcond_without chromebook -%if %{with flagship} || %{with kde} || %{with gnome} || %{with xfce} || %{with atomic_flagship} || %{with atomic_kde} || %{with atomic_gnome} || %{with atomic_xfce} +%if %{with flagship} || %{with plasma} || %{with gnome} || %{with xfce} || %{with atomic_flagship} || %{with atomic_plasma} || %{with atomic_gnome} || %{with atomic_xfce} %global with_desktop 1 %endif -%if %{with atomic_flagship} || %{with atomic_kde} || %{with atomic_gnome} || %{with atomic_xfce} +%if %{with atomic_flagship} || %{with atomic_plasma} || %{with atomic_gnome} || %{with atomic_xfce} %global with_atomic_desktop 1 %endif @@ -93,12 +93,12 @@ Source40: https://github.com/Ultramarine-Linux/xfce-config/archive/%{xfce_conf Source50: ultramarine.conf Source51: ultramarine-flagship.conf Source52: ultramarine-gnome.conf -Source53: ultramarine-kde.conf +Source53: ultramarine-plasma.conf Source54: ultramarine-xfce.conf Source60: ultramarine-flagship-protected.conf Source61: ultramarine-gnome-protected.conf -Source62: ultramarine-kde-protected.conf +Source62: ultramarine-plasma-protected.conf Source63: ultramarine-xfce-protected.conf Source64: 88-ultramarine-chromebook-default.preset @@ -238,14 +238,14 @@ Provides the necessary files for a Ultramarine Atomic Flagship installation. %endif ###################################################################### -####### KDE ####### +####### Plasma ####### -%if %{with kde} -%package kde -Summary: Base package for Ultramarine KDE-specific default configurations -RemovePathPostfixes: .kde +%if %{with plasma} +%package plasma +Summary: Base package for Ultramarine Plasma-specific default configurations +RemovePathPostfixes: .plasma Provides: ultramarine-release = %{version}-%{release} -Provides: ultramarine-release-kde = %{version}-%{release} +Provides: ultramarine-release-plasma = %{version}-%{release} Provides: ultramarine-release-variant = %{version}-%{release} Provides: system-release Provides: system-release(%{version}) @@ -256,34 +256,34 @@ Provides: system-release-product # ultramarine-release-common Requires: ultramarine-release-identity, so at least one # package must provide it. This Recommends: pulls in # ultramarine-release-identity-cinnamon if nothing else is already doing so. -Recommends: ultramarine-release-identity-kde +Recommends: ultramarine-release-identity-plasma Recommends: kwin-system76-scheduler-integration -%description kde -Provides a base package for Ultramarine KDE configurations. +%description plasma +Provides a base package for Ultramarine Plasma configurations. -%package identity-kde -Summary: Package providing the Ultramarine KDE Identity -RemovePathPostfixes: .kde +%package identity-plasma +Summary: Package providing the Ultramarine Plasma Identity +RemovePathPostfixes: .plasma Provides: ultramarine-release-identity = %{version}-%{release} Conflicts: ultramarine-release-identity -Requires(meta): ultramarine-release-kde = %{version}-%{release} +Requires(meta): ultramarine-release-Plasma = %{version}-%{release} -%description identity-kde -Provides the necessary files for a Ultramarine KDE installation. +%description identity-plasma +Provides the necessary files for a Ultramarine Plasma installation. %endif ###################################################################### -####### Atomic KDE ####### +####### Atomic Plasma ####### -%if %{with atomic_kde} -%package atomic-kde -Summary: Base package for Ultramarine Atomic KDE-specific default configurations +%if %{with atomic_plasma} +%package atomic-plasma +Summary: Base package for Ultramarine Atomic Plasma-specific default configurations -RemovePathPostfixes: .atomic-kde +RemovePathPostfixes: .atomic-plasma Provides: ultramarine-release = %{version}-%{release} -Provides: ultramarine-release-atomic-kde = %{version}-%{release} +Provides: ultramarine-release-atomic-plasma = %{version}-%{release} Provides: ultramarine-release-variant = %{version}-%{release} Provides: system-release Provides: system-release(%{version}) @@ -295,20 +295,20 @@ Provides: system-release-product # ultramarine-release-common Requires: ultramarine-release-identity, so at least one # package must provide it. This Recommends: pulls in # ultramarine-release-identity-cinnamon if nothing else is already doing so. -Recommends: ultramarine-release-identity-atomic-kde +Recommends: ultramarine-release-identity-atomic-plasma -%description atomic-kde -Provides a base package for Ultramarine Atomic KDE configurations. +%description atomic-plasma +Provides a base package for Ultramarine Atomic Plasma configurations. -%package identity-atomic-kde -Summary: Package providing the Ultramarine Atomic KDE Identity -RemovePathPostfixes: .atomic-kde +%package identity-atomic-Plasma +Summary: Package providing the Ultramarine Atomic Plasma Identity +RemovePathPostfixes: .atomic-plasma Provides: ultramarine-release-identity = %{version}-%{release} Conflicts: ultramarine-release-identity -Requires(meta): ultramarine-release-atomic-kde = %{version}-%{release} +Requires(meta): ultramarine-release-atomic-plasma = %{version}-%{release} -%description identity-atomic-kde -Provides the necessary files for a Ultramarine Atomic KDE installation. +%description identity-atomic-plasma +Provides the necessary files for a Ultramarine Atomic Plasma installation. %endif @@ -655,29 +655,29 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(Atomic Flagship Edition%{?prerelea sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Atomic Flagship/;s///;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-flagship %endif -%if %{with kde} -# KDE +%if %{with plasma} +# Plasma cp -p os-release \ - %{buildroot}%{_prefix}/lib/os-release.kde -echo "VARIANT=\"KDE Plasma Edition\"" >> %{buildroot}%{_prefix}/lib/os-release.kde -echo "VARIANT_ID=kde" >> %{buildroot}%{_prefix}/lib/os-release.kde -sed -i -e "s|(%{release_name}%{?prerelease})|(KDE Plasma Edition%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.kde -sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/KDE Plasma/;s///;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.kde + %{buildroot}%{_prefix}/lib/os-release.plasma +echo "VARIANT=\"Plasma Edition\"" >> %{buildroot}%{_prefix}/lib/os-release.plasma +echo "VARIANT_ID=plasma" >> %{buildroot}%{_prefix}/lib/os-release.plasma +sed -i -e "s|(%{release_name}%{?prerelease})|(Plasma Edition%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.plasma +sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Plasma/;s///;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.plasma -install -Dm0644 %{SOURCE62} %{buildroot}%{_sysconfdir}/dnf/protected.d/ultramarine-kde.conf +install -Dm0644 %{SOURCE62} %{buildroot}%{_sysconfdir}/dnf/protected.d/ultramarine-plasma.conf install -Dm644 %{SOURCE31} %{buildroot}%{_userunitdir}/enable-kwin-system76-scheduler-integration.service %endif -%if %{with atomic_kde} -# Atomic KDE +%if %{with atomic_plasma} +# Atomic Plasma cp -p os-release \ - %{buildroot}%{_prefix}/lib/os-release.atomic-kde -echo "VARIANT=\"Atomic KDE Plasma Edition\"" >> %{buildroot}%{_prefix}/lib/os-release.atomic-kde -echo "VARIANT_ID=atomic-kde" >> %{buildroot}%{_prefix}/lib/os-release.atomic-kde -sed -i -e "s|(%{release_name}%{?prerelease})|(Atomic KDE Plasma Edition%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.atomic-kde -sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Atomic KDE Plasma/;s///;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-kde + %{buildroot}%{_prefix}/lib/os-release.atomic-plasma +echo "VARIANT=\"Atomic Plasma Edition\"" >> %{buildroot}%{_prefix}/lib/os-release.atomic-plasma +echo "VARIANT_ID=atomic-plasma" >> %{buildroot}%{_prefix}/lib/os-release.atomic-plasma +sed -i -e "s|(%{release_name}%{?prerelease})|(Atomic Plasma Edition%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.atomic-plasma +sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Atomic Plasma/;s///;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-plasma install -Dm644 %{SOURCE31} %{buildroot}%{_userunitdir}/enable-kwin-system76-scheduler-integration.service @@ -765,7 +765,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/anaconda/profile.d/ cp -pr %{SOURCE50} %{buildroot}%{_sysconfdir}/anaconda/profile.d/ultramarine.conf cp -pr %{SOURCE51} %{buildroot}%{_sysconfdir}/anaconda/profile.d/ultramarine-flagship.conf cp -pr %{SOURCE52} %{buildroot}%{_sysconfdir}/anaconda/profile.d/ultramarine-gnome.conf -cp -pr %{SOURCE53} %{buildroot}%{_sysconfdir}/anaconda/profile.d/ultramarine-kde.conf +cp -pr %{SOURCE53} %{buildroot}%{_sysconfdir}/anaconda/profile.d/ultramarine-plasma.conf cp -pr %{SOURCE54} %{buildroot}%{_sysconfdir}/anaconda/profile.d/ultramarine-xfce.conf # sysctls @@ -869,23 +869,23 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/ %endif -# the funny KDE system76 scheduler integration -%if %{with kde} +# the funny Plasma system76 scheduler integration +%if %{with plasma} -%post identity-kde +%post identity-plasma %systemd_user_post enable-kwin-system76-scheduler-integration.service -%preun identity-kde +%preun identity-plasma %systemd_user_preun enable-kwin-system76-scheduler-integration.service %endif -%if %{with atomic_kde} +%if %{with atomic_plasma} -%post identity-atomic-kde +%post identity-atomic-plasma %systemd_user_post enable-kwin-system76-scheduler-integration.service -%preun identity-atomic-kde +%preun identity-atomic-plasma %systemd_user_preun enable-kwin-system76-scheduler-integration.service %endif @@ -896,7 +896,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/ %{_sysconfdir}/anaconda/profile.d/ultramarine.conf %{_sysconfdir}/anaconda/profile.d/ultramarine-flagship.conf %{_sysconfdir}/anaconda/profile.d/ultramarine-gnome.conf -%{_sysconfdir}/anaconda/profile.d/ultramarine-kde.conf +%{_sysconfdir}/anaconda/profile.d/ultramarine-plasma.conf %{_sysconfdir}/anaconda/profile.d/ultramarine-xfce.conf %{_prefix}/lib/sysctl.d/50-ultramarine-networking.conf %license licenses/LICENSE licenses/README.license @@ -955,20 +955,20 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/ %{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-flagship-lightdm-gtk-greeter.conf %endif -%if %{with kde} -%files kde -%files identity-kde -%{_prefix}/lib/os-release.kde -%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.kde -%{_sysconfdir}/dnf/protected.d/ultramarine-kde.conf +%if %{with plasma} +%files plasma +%files identity-plasma +%{_prefix}/lib/os-release.plasma +%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.plasma +%{_sysconfdir}/dnf/protected.d/ultramarine-plasma.conf %config %_userunitdir/enable-kwin-system76-scheduler-integration.service %endif -%if %{with atomic_kde} -%files atomic-kde -%files identity-atomic-kde -%{_prefix}/lib/os-release.atomic-kde -%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-kde +%if %{with atomic_plasma} +%files atomic-plasma +%files identity-atomic-plasma +%{_prefix}/lib/os-release.atomic-plasma +%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-plasma %config %_userunitdir/enable-kwin-system76-scheduler-integration.service %endif