| |
@@ -44,9 +44,9 @@
|
| |
%bcond_with i3
|
| |
%bcond_with lxqt
|
| |
%bcond_with budgie
|
| |
+ %bcond_with budgie_atomic
|
| |
%bcond_with sway
|
| |
- %bcond_with sericea
|
| |
- %bcond_with onyx
|
| |
+ %bcond_with sway_atomic
|
| |
%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 sericea
|
| |
- %bcond_without onyx
|
| |
+ %bcond_without sway_atomic
|
| |
%bcond_without mobility
|
| |
%endif
|
| |
|
| |
- %if %{with silverblue} || %{with kinoite} || %{with sericea} || %{with onyx}
|
| |
+ %if %{with silverblue} || %{with kinoite} || %{with sway_atomic} || %{with budgie_atomic}
|
| |
%global with_ostree_desktop 1
|
| |
%endif
|
| |
|
| |
@@ -1095,11 +1095,11 @@
|
| |
%endif
|
| |
|
| |
|
| |
- %if %{with sericea}
|
| |
- %package sericea
|
| |
- Summary: Base package for Fedora Sericea specific default configurations
|
| |
+ %if %{with sway_atomic}
|
| |
+ %package sway-atomic
|
| |
+ Summary: Base package for Fedora Sway Atomic specific default configurations
|
| |
|
| |
- RemovePathPostfixes: .sericea
|
| |
+ RemovePathPostfixes: .sway-atomic
|
| |
Provides: fedora-release = %{version}-%{release}
|
| |
Provides: fedora-release-variant = %{version}-%{release}
|
| |
Provides: system-release
|
| |
@@ -1109,34 +1109,34 @@
|
| |
|
| |
# fedora-release-common Requires: fedora-release-identity, so at least one
|
| |
# package must provide it. This Recommends: pulls in
|
| |
- # fedora-release-identity-sericea if nothing else is already doing so.
|
| |
- Recommends: fedora-release-identity-sericea
|
| |
+ # fedora-release-identity-sway-atomic if nothing else is already doing so.
|
| |
+ Recommends: fedora-release-identity-sway-atomic
|
| |
|
| |
|
| |
- %description sericea
|
| |
- Provides a base package for Fedora Sericea specific configuration
|
| |
+ %description sway-atomic
|
| |
+ Provides a base package for Fedora Sway Atomic specific configuration
|
| |
files to depend on.
|
| |
|
| |
|
| |
- %package identity-sericea
|
| |
- Summary: Package providing the identity for Fedora Sericea
|
| |
+ %package identity-sway-atomic
|
| |
+ Summary: Package providing the identity for Fedora Sway Atomic
|
| |
|
| |
- RemovePathPostfixes: .sericea
|
| |
+ RemovePathPostfixes: .sway-atomic
|
| |
Provides: fedora-release-identity = %{version}-%{release}
|
| |
Conflicts: fedora-release-identity
|
| |
- Requires(meta): fedora-release-sericea = %{version}-%{release}
|
| |
+ Requires(meta): fedora-release-sway-atomic = %{version}-%{release}
|
| |
|
| |
|
| |
- %description identity-sericea
|
| |
+ %description identity-sway-atomic
|
| |
Provides the necessary files for a Fedora installation that is identifying
|
| |
- itself as Fedora Sericea.
|
| |
+ 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 @@
|
| |
|
| |
# 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
|
| |
|
| |
|
| |
@@ -1580,25 +1580,26 @@
|
| |
install -Dm0644 %{SOURCE30} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
|
| |
%endif
|
| |
|
| |
- %if %{with sericea}
|
| |
- cp -p os-release %{buildroot}%{_prefix}/lib/os-release.sericea
|
| |
- echo "VARIANT=\"Sericea\"" >> %{buildroot}%{_prefix}/lib/os-release.sericea
|
| |
- echo "VARIANT_ID=sericea" >> %{buildroot}%{_prefix}/lib/os-release.sericea
|
| |
- sed -i -e "s|(%{release_name}%{?prerelease})|(Sericea%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.sericea
|
| |
- sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora-sericea/"|' %{buildroot}%{_prefix}/lib/os-release.sericea
|
| |
- sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/sericea/"|' %{buildroot}/%{_prefix}/lib/os-release.sericea
|
| |
- sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://gitlab.com/fedora/sigs/sway/SIG/-/issues"|' %{buildroot}/%{_prefix}/lib/os-release.sericea
|
| |
- sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Sericea/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sericea
|
| |
+ %if %{with sway_atomic}
|
| |
+ cp -p os-release %{buildroot}%{_prefix}/lib/os-release.sway-atomic
|
| |
+ echo "VARIANT=\"Sway Atomic\"" >> %{buildroot}%{_prefix}/lib/os-release.sway-atomic
|
| |
+ echo "VARIANT_ID=sway-atomic" >> %{buildroot}%{_prefix}/lib/os-release.sway-atomic
|
| |
+ sed -i -e "s|(%{release_name}%{?prerelease})|(Sway Atomic%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.sway-atomic
|
| |
+ sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora-sericea/"|' %{buildroot}%{_prefix}/lib/os-release.sway-atomic
|
| |
+ sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/atomic-desktops/sway/"|' %{buildroot}/%{_prefix}/lib/os-release.sway-atomic
|
| |
+ sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://gitlab.com/fedora/sigs/sway/SIG/-/issues"|' %{buildroot}/%{_prefix}/lib/os-release.sway-atomic
|
| |
+ 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}
|
| |
@@ -1896,19 +1897,19 @@
|
| |
%endif
|
| |
|
| |
|
| |
- %if %{with sericea}
|
| |
- %files sericea
|
| |
- %files identity-sericea
|
| |
- %{_prefix}/lib/os-release.sericea
|
| |
- %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sericea
|
| |
+ %if %{with sway_atomic}
|
| |
+ %files sway-atomic
|
| |
+ %files identity-sway-atomic
|
| |
+ %{_prefix}/lib/os-release.sway-atomic
|
| |
+ %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sway-atomic
|
| |
%{_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
|
| |
|
| |
siosm
commented 3 months ago
Rebrand Sericea to Sway Atomic
See: https://fedoraproject.org/wiki/Changes/AtomicDesktops
Rebrand Onyx to Budgie Atomic
See: https://fedoraproject.org/wiki/Changes/AtomicDesktops
Replaces:
- https://src.fedoraproject.org/rpms/fedora-release/pull-request/304
- https://src.fedoraproject.org/rpms/fedora-release/pull-request/305
This is also for to be backported to F40.
Workstation ostree changes will land after this one lands in the repos.