From 9ee0c7ec73f076ce5d29fdc4b71aa8da8185838f Mon Sep 17 00:00:00 2001 From: Joshua Strobl Date: Feb 26 2024 20:01:56 +0000 Subject: Rebrand Onyx to Budgie Atomic See: https://fedoraproject.org/wiki/Changes/AtomicDesktops --- diff --git a/fedora-release.spec b/fedora-release.spec index ca89313..d63fa02 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -44,9 +44,9 @@ %bcond_with i3 %bcond_with lxqt %bcond_with budgie +%bcond_with budgie_atomic %bcond_with sway %bcond_with sway_atomic -%bcond_with onyx %bcond_with mobility %else %bcond_without basic @@ -71,13 +71,13 @@ %bcond_without i3 %bcond_without lxqt %bcond_without budgie +%bcond_without budgie_atomic %bcond_without sway %bcond_without sway_atomic -%bcond_without onyx %bcond_without mobility %endif -%if %{with silverblue} || %{with kinoite} || %{with sway_atomic} || %{with onyx} +%if %{with silverblue} || %{with kinoite} || %{with sway_atomic} || %{with budgie_atomic} %global with_ostree_desktop 1 %endif @@ -1132,11 +1132,11 @@ Provides the necessary files for a Fedora installation that is identifying itself as Fedora Sway Atomic. %endif -%if %{with onyx} -%package onyx -Summary: Base package for Fedora Onyx specific default configurations +%if %{with budgie_atomic} +%package budgie-atomic +Summary: Base package for Fedora Budgie Atomic specific default configurations -RemovePathPostfixes: .onyx +RemovePathPostfixes: .budgie-atomic Provides: fedora-release = %{version}-%{release} Provides: fedora-release-variant = %{version}-%{release} Provides: system-release @@ -1146,27 +1146,27 @@ Requires: fedora-release-ostree-desktop = %{version}-%{release} # fedora-release-common Requires: fedora-release-identity, so at least one # package must provide it. This Recommends: pulls in -# fedora-release-identity-onyx if nothing else is already doing so. -Recommends: fedora-release-identity-onyx +# fedora-release-identity-budgie-atomic if nothing else is already doing so. +Recommends: fedora-release-identity-budgie-atomic -%description onyx -Provides a base package for Fedora Onyx specific configuration +%description budgie-atomic +Provides a base package for Fedora Budgie Atomic specific configuration files to depend on. -%package identity-onyx -Summary: Package providing the identity for Fedora Onyx +%package identity-budgie-atomic +Summary: Package providing the identity for Fedora Budgie Atomic -RemovePathPostfixes: .onyx +RemovePathPostfixes: .budgie-atomic Provides: fedora-release-identity = %{version}-%{release} Conflicts: fedora-release-identity -Requires(meta): fedora-release-onyx = %{version}-%{release} +Requires(meta): fedora-release-budgie-atomic = %{version}-%{release} -%description identity-onyx +%description identity-budgie-atomic Provides the necessary files for a Fedora installation that is identifying -itself as Fedora Onyx. +itself as Fedora Budgie Atomic. %endif @@ -1591,14 +1591,15 @@ sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://gitlab.com/fedora/sigs/sw sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/SwayAtomic/;s///;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sway-atomic %endif -%if %{with onyx} -cp -p os-release %{buildroot}%{_prefix}/lib/os-release.onyx -echo "VARIANT=\"Onyx\"" >> %{buildroot}%{_prefix}/lib/os-release.onyx -echo "VARIANT_ID=onyx" >> %{buildroot}%{_prefix}/lib/os-release.onyx -sed -i -e "s|(%{release_name}%{?prerelease})|(Onyx%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.onyx -sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora-onyx/"|' %{buildroot}%{_prefix}/lib/os-release.onyx -sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/onyx/"|' %{buildroot}/%{_prefix}/lib/os-release.onyx -sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Onyx/;s///;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.onyx +%if %{with budgie_atomic} +cp -p os-release %{buildroot}%{_prefix}/lib/os-release.budgie-atomic +echo "VARIANT=\"Budgie Atomic\"" >> %{buildroot}%{_prefix}/lib/os-release.budgie-atomic +echo "VARIANT_ID=budgie-atomic" >> %{buildroot}%{_prefix}/lib/os-release.budgie-atomic +sed -i -e "s|(%{release_name}%{?prerelease})|(Budgie Atomic%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.budgie-atomic +sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora-onyx/"|' %{buildroot}%{_prefix}/lib/os-release.budgie-atomic +sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/atomic-desktops/budgie/"|' %{buildroot}/%{_prefix}/lib/os-release.budgie-atomic +sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-budgie/project/issues"|' %{buildroot}/%{_prefix}/lib/os-release.budgie-atomic +sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/BudgieAtomic/;s///;/^$/d' %{SOURCE19} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.budgie-atomic %endif %if %{with mobility} @@ -1904,11 +1905,11 @@ ln -s --relative %{buildroot}%{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swid %{_prefix}/lib/systemd/system-preset/81-desktop.preset %endif -%if %{with onyx} -%files onyx -%files identity-onyx -%{_prefix}/lib/os-release.onyx -%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.onyx +%if %{with budgie_atomic} +%files budgie-atomic +%files identity-budgie-atomic +%{_prefix}/lib/os-release.budgie-atomic +%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.budgie-atomic %{_prefix}/lib/systemd/system-preset/81-desktop.preset %endif