PR#304: Sericea: rename to Sway Atomic - rpms/fedora-release

rpms / fedora-release

#304 Sericea: rename to Sway Atomic

Closed 3 months ago by siosm. Opened 3 months ago by alebastr.

rpms/ alebastr/fedora-release rawhide into rawhide

Sericea: rename to Sway Atomic

Aleksei Bavshin • 3 months ago

c2912ba

fedora-release.spec

file modified

+31 -31

		`@@ -45,7 +45,7 @@`
		`%bcond_with lxqt`
		`%bcond_with budgie`
		`%bcond_with sway`
		`- %bcond_with sericea`
		`+ %bcond_with sway_atomic`
		`%bcond_with onyx`
		`%bcond_with mobility`
		`%else`
		`@@ -72,12 +72,12 @@`
		`%bcond_without lxqt`
		`%bcond_without budgie`
		`%bcond_without sway`
		`- %bcond_without sericea`
		`+ %bcond_without sway_atomic`
		`%bcond_without onyx`
		`%bcond_without mobility`
		`%endif`

		`- %if %{with silverblue} \|\| %{with kinoite} \|\| %{with sericea} \|\| %{with onyx}`
		`+ %if %{with silverblue} \|\| %{with kinoite} \|\| %{with sway_atomic} \|\| %{with onyx}`
		`%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,27 +1109,27 @@`

		`# 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}`
		`@@ -1580,15 +1580,15 @@`
		`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}`
		`@@ -1896,11 +1896,11 @@`
		`%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`

alebastr commented 3 months ago

See https://fedoramagazine.org/introducing-fedora-atomic-desktops/

workstation-ostree-config must be updated after merging this.

cc: @fale, @jkonecny

jkonecny commented 3 months ago

Sounds like a good idea to me. I think we should try to get rid of Sericea because with time it will be hard for people because they will be looking for something else.

Ad packages, don't we want to have metapackage which provides current package with setting the current one as deprecated and leave it this way for a while?

zuul commented 3 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/057a6db8b7b241dd89fdc19c298be7b4

check-for-arches : SUCCESS in 1m 35s
check-for-eln : SUCCESS in 18s
eln-rpm-scratch-build : SUCCESS in 10m 52s
rpm-scratch-build : SUCCESS in 6m 16s
rpm-scratch-build-s390x : SUCCESS in 6m 58s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 7m 34s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 6m 00s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 6m 25s (non-voting)
rpm-linter : FAILURE in 12m 35s (non-voting)
rpm-rpminspect : TIMED_OUT in 31m 03s (non-voting)
check-for-sti-tests : SUCCESS in 15s
check-for-fmf-tests : SUCCESS in 17s
rpm-install-test : FAILURE in 1m 31s
Skipped 2 jobs

rebased onto 11e48c9d6daaf550f8eef391cab2274a2945c8b3

3 months ago

zuul commented 3 months ago

check-for-arches : SUCCESS in 1m 32s
check-for-eln : SUCCESS in 20s
eln-rpm-scratch-build : SUCCESS in 7m 14s
rpm-scratch-build : SUCCESS in 7m 55s
rpm-scratch-build-s390x : SUCCESS in 6m 26s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 11m 05s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 6m 25s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 7m 33s (non-voting)
rpm-linter : FAILURE in 13m 49s (non-voting)
rpm-rpminspect : TIMED_OUT in 30m 45s (non-voting)
check-for-sti-tests : SUCCESS in 15s
check-for-fmf-tests : SUCCESS in 17s
rpm-install-test : FAILURE in 1m 41s
Skipped 2 jobs

siosm commented 3 months ago

Regarding package names, we should be able to do a hard switch. I think we should look at removing the name completely from the packages and keeping an "historical" mention somewhere in the docs for reference.

For VARIANT_ID, we probably want sway-atomic to be able to distinguish them from classic Sway Spin systems in count me stats.

rebased onto ea229a98c6621a55e0dafc7763ad964510b423bc

3 months ago

zuul commented 3 months ago

check-for-arches : SUCCESS in 2m 13s
check-for-eln : SUCCESS in 17s
eln-rpm-scratch-build : SUCCESS in 8m 28s
rpm-scratch-build : SUCCESS in 9m 04s
rpm-scratch-build-s390x : SUCCESS in 6m 54s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 15m 05s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 7m 52s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 7m 54s (non-voting)
rpm-linter : FAILURE in 14m 05s (non-voting)
rpm-rpminspect : TIMED_OUT in 30m 47s (non-voting)
check-for-sti-tests : SUCCESS in 17s
check-for-fmf-tests : SUCCESS in 16s
rpm-install-test : FAILURE in 1m 13s
Skipped 2 jobs

sgallagh commented 3 months ago

I think we can avoid doing the Obsoletes/Provides dance with these packages specifically because they will only be installed on ostree-based systems.

I'm not sure what @siosm means by "think we should look at removing the name completely from the packages and keeping an "historical" mention somewhere in the docs for reference", though. Removing what name from which packages?

alebastr commented 3 months ago

I think we can avoid doing the Obsoletes/Provides dance with these packages specifically because they will only be installed on ostree-based systems.

I'm not sure what @siosm means by "think we should look at removing the name completely from the packages and keeping an "historical" mention somewhere in the docs for reference", though. Removing what name from which packages?

First revision of this PR only touched user-visible strings. I renamed the packages and removed all remaining mentions of 'sericea' after @siosm's comment.

siosm commented 3 months ago

Removing the Sericea name entirely from the specfile

Edited 3 months ago by siosm

siosm commented 3 months ago

LGTM. We still need to update the docs but that can happen after with a redirect.

sgallagh commented 3 months ago

Please also indicate if this is intended for Fedora 40 as well as Rawhide, now that the fork is complete.

alebastr commented 3 months ago

https://fedoraproject.org/wiki/Changes/AtomicDesktops is a Fedora 40 change, no reason to skip f40. I was planning to send a backport PR once this one is merged.

rebased onto c2912ba

3 months ago

zuul commented 3 months ago