Skip to content

chore: cleanup some packages and comps#280

Merged
lleyton merged 6 commits intoumrawhidefrom
owen/cleanup
Feb 20, 2026
Merged

chore: cleanup some packages and comps#280
lleyton merged 6 commits intoumrawhidefrom
owen/cleanup

Conversation

@Owen-sz
Copy link
Copy Markdown
Member

@Owen-sz Owen-sz commented Feb 20, 2026

  • Add packages currently in Ultramarine build scripts into the product-common comp, as to not repeat these packages in multiple build scripts (WSL)
  • Fix some formatting and use proper macros for some packages
  • Remove some outdated scripts (for older Fedora versions)
  • Move terra-release-mesa dep from ultramarine-repos-extras to ultramarine-repos-common, and update description of ultramarine-repos-extras to add terra-release-extras
  • Remove %define debug_package %nil from ultramarine-fun (it is not needed, the package is noarch)
  • Replaces all hard coded Fedora versions with %{?fedora}
  • Adds update.rhai to backgrounds package
  • Cleanup README a bit

- Add packages currently in Ultramarine build scripts into the product-common comp, as to not repeat these packages in multiple build scripts (WSL)
- Fix some formatting and use proper macros for some packages
- Remove some outdated scripts (for older Fedora versions)
- Move terra-release-mesa dep from ultramarine-repos-extras to ultramarine-repos-common, and update description of ultramarine-repos-extras to add terra-release-extras

Signed-off-by: Owen-sz <owen@fyralabs.com>
@GildedRoach
Copy link
Copy Markdown
Collaborator

GildedRoach commented Feb 20, 2026

Change Version: to %{?fedora} on stuff versioned by releasever, it's cleaner and will always be correct on all branches.

@Owen-sz
Copy link
Copy Markdown
Member Author

Owen-sz commented Feb 20, 2026

%{?fedora}

Truth nuke

Signed-off-by: Owen-sz <owen@fyralabs.com>
Signed-off-by: Owen-sz <owen@fyralabs.com>
Signed-off-by: Owen-sz <owen@fyralabs.com>
Signed-off-by: Owen-sz <owen@fyralabs.com>
@lleyton lleyton merged commit bcc756f into umrawhide Feb 20, 2026
5 of 37 checks passed
@raboneko
Copy link
Copy Markdown
Collaborator

💔 All backports failed

Status Branch Result
um44 Backport failed because of merge conflicts
um43 Backport failed because of merge conflicts
um42 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

backport --pr 280

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

lleyton pushed a commit that referenced this pull request Feb 20, 2026
* chore: cleanup some packages and comps

- Add packages currently in Ultramarine build scripts into the product-common comp, as to not repeat these packages in multiple build scripts (WSL)
- Fix some formatting and use proper macros for some packages
- Remove some outdated scripts (for older Fedora versions)
- Move terra-release-mesa dep from ultramarine-repos-extras to ultramarine-repos-common, and update description of ultramarine-repos-extras to add terra-release-extras

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat: use %{?fedora}

Signed-off-by: Owen-sz <owen@fyralabs.com>

* chore: remove outdated if statement in kde-settings

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat (backgrounds): use repos version, add update.rhai

Signed-off-by: Owen-sz <owen@fyralabs.com>

* doc: update README

Signed-off-by: Owen-sz <owen@fyralabs.com>

* Add backgrounds comment

---------

Signed-off-by: Owen-sz <owen@fyralabs.com>
(cherry picked from commit bcc756f)

# Conflicts:
#	ultramarine/logos/ultramarine-logos.spec
#	ultramarine/release/ultramarine-release.spec
#	ultramarine/repos/repos.spec
@lleyton
Copy link
Copy Markdown
Member

lleyton commented Feb 20, 2026

💚 All backports created successfully

Status Branch Result
um44

Questions ?

Please refer to the Backport tool documentation

lleyton added a commit that referenced this pull request Feb 20, 2026
* chore: cleanup some packages and comps

- Add packages currently in Ultramarine build scripts into the product-common comp, as to not repeat these packages in multiple build scripts (WSL)
- Fix some formatting and use proper macros for some packages
- Remove some outdated scripts (for older Fedora versions)
- Move terra-release-mesa dep from ultramarine-repos-extras to ultramarine-repos-common, and update description of ultramarine-repos-extras to add terra-release-extras

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat: use %{?fedora}

Signed-off-by: Owen-sz <owen@fyralabs.com>

* chore: remove outdated if statement in kde-settings

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat (backgrounds): use repos version, add update.rhai

Signed-off-by: Owen-sz <owen@fyralabs.com>

* doc: update README

Signed-off-by: Owen-sz <owen@fyralabs.com>

* Add backgrounds comment

---------

Signed-off-by: Owen-sz <owen@fyralabs.com>
(cherry picked from commit bcc756f)

# Conflicts:
#	ultramarine/logos/ultramarine-logos.spec
#	ultramarine/release/ultramarine-release.spec
#	ultramarine/repos/repos.spec

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
Owen-sz added a commit that referenced this pull request Apr 1, 2026
* chore: cleanup some packages and comps

- Add packages currently in Ultramarine build scripts into the product-common comp, as to not repeat these packages in multiple build scripts (WSL)
- Fix some formatting and use proper macros for some packages
- Remove some outdated scripts (for older Fedora versions)
- Move terra-release-mesa dep from ultramarine-repos-extras to ultramarine-repos-common, and update description of ultramarine-repos-extras to add terra-release-extras

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat: use %{?fedora}

Signed-off-by: Owen-sz <owen@fyralabs.com>

* chore: remove outdated if statement in kde-settings

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat (backgrounds): use repos version, add update.rhai

Signed-off-by: Owen-sz <owen@fyralabs.com>

* doc: update README

Signed-off-by: Owen-sz <owen@fyralabs.com>

* Add backgrounds comment

---------

Signed-off-by: Owen-sz <owen@fyralabs.com>
Owen-sz added a commit that referenced this pull request Apr 1, 2026
* chore: cleanup some packages and comps

- Add packages currently in Ultramarine build scripts into the product-common comp, as to not repeat these packages in multiple build scripts (WSL)
- Fix some formatting and use proper macros for some packages
- Remove some outdated scripts (for older Fedora versions)
- Move terra-release-mesa dep from ultramarine-repos-extras to ultramarine-repos-common, and update description of ultramarine-repos-extras to add terra-release-extras

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat: use %{?fedora}

Signed-off-by: Owen-sz <owen@fyralabs.com>

* chore: remove outdated if statement in kde-settings

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat (backgrounds): use repos version, add update.rhai

Signed-off-by: Owen-sz <owen@fyralabs.com>

* doc: update README

Signed-off-by: Owen-sz <owen@fyralabs.com>

* Add backgrounds comment

---------

Signed-off-by: Owen-sz <owen@fyralabs.com>

chore: remove unremoved rebase message

Signed-off-by: Owen-sz <owen@fyralabs.com>
Owen-sz added a commit that referenced this pull request Apr 1, 2026
* chore: cleanup some packages and comps (#280)

* chore: cleanup some packages and comps

- Add packages currently in Ultramarine build scripts into the product-common comp, as to not repeat these packages in multiple build scripts (WSL)
- Fix some formatting and use proper macros for some packages
- Remove some outdated scripts (for older Fedora versions)
- Move terra-release-mesa dep from ultramarine-repos-extras to ultramarine-repos-common, and update description of ultramarine-repos-extras to add terra-release-extras

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat: use %{?fedora}

Signed-off-by: Owen-sz <owen@fyralabs.com>

* chore: remove outdated if statement in kde-settings

Signed-off-by: Owen-sz <owen@fyralabs.com>

* feat (backgrounds): use repos version, add update.rhai

Signed-off-by: Owen-sz <owen@fyralabs.com>

* doc: update README

Signed-off-by: Owen-sz <owen@fyralabs.com>

* Add backgrounds comment

---------

Signed-off-by: Owen-sz <owen@fyralabs.com>

chore: remove unremoved rebase message

Signed-off-by: Owen-sz <owen@fyralabs.com>

* chore: bump backgrounds package to what it was before

Signed-off-by: Owen-sz <owen@fyralabs.com>

---------

Signed-off-by: Owen-sz <owen@fyralabs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants