From 2c3a271525b9ac40f72e39a3ecf79d1082b39716 Mon Sep 17 00:00:00 2001 From: madonuko Date: Sat, 15 Mar 2025 13:28:40 +0800 Subject: [PATCH 1/5] feat(release): bump to 42 --- ultramarine/release/ultramarine-release.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 3295a00..661adc4 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -1,9 +1,9 @@ %global is_rawhide 0 -%global release_name Cyberia -%global fedora_codename Forty One -%global codename cyberia -%define dist_version 41 +%global release_name Heart of Gold +%global fedora_codename Forty Two +%global codename heart_of_gold +%define dist_version 42 %define _alt_name fedora-release %define xfce_conf_commit db16bb9fdc2c5777389db1fcab81ba3489393e4e @@ -52,7 +52,7 @@ Summary: Ultramarine Linux release files Name: ultramarine-release Version: %{dist_version} -Release: 13%{?dist} +Release: 1%{?dist} License: MIT Source0: LICENSE URL: https://ultramarine-linux.org From 03a0f9795b94123839591fec1634460dc534f70e Mon Sep 17 00:00:00 2001 From: madonuko Date: Sat, 15 Mar 2025 13:29:43 +0800 Subject: [PATCH 2/5] feat(repos): bump to 42 --- ultramarine/kde-settings/kde-settings.spec | 2 +- ultramarine/repos/repos.spec | 4 ++-- .../ultramarine-mock-configs/ultramarine-mock-configs.spec | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ultramarine/kde-settings/kde-settings.spec b/ultramarine/kde-settings/kde-settings.spec index b5b0a4e..daa3336 100644 --- a/ultramarine/kde-settings/kde-settings.spec +++ b/ultramarine/kde-settings/kde-settings.spec @@ -1048,4 +1048,4 @@ test -f %{_datadir}/wallpapers/F%{version_maj} || ls -l %{_datadir}/wallpapers - kdmrc: revert to ServerVTs=-1 (#475890) * Sun Nov 29 2009 Rex Dieter 4.4-1 -- -pulseaudio: drop xine-lib-pulseaudio (subpkg no longer exists) \ No newline at end of file +- -pulseaudio: drop xine-lib-pulseaudio (subpkg no longer exists) diff --git a/ultramarine/repos/repos.spec b/ultramarine/repos/repos.spec index 935f986..ef238b6 100644 --- a/ultramarine/repos/repos.spec +++ b/ultramarine/repos/repos.spec @@ -1,8 +1,8 @@ -%global _dist_version 41 +%global _dist_version 42 Name: ultramarine-repos Version: %{_dist_version} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT Summary: Repositories for Ultramarine Linux Requires: %{name}-common = %{version}-%{release} diff --git a/ultramarine/ultramarine-mock-configs/ultramarine-mock-configs.spec b/ultramarine/ultramarine-mock-configs/ultramarine-mock-configs.spec index e576c10..4ae06c8 100644 --- a/ultramarine/ultramarine-mock-configs/ultramarine-mock-configs.spec +++ b/ultramarine/ultramarine-mock-configs/ultramarine-mock-configs.spec @@ -19,6 +19,8 @@ Source11: ultramarine-40-x86_64.cfg Source12: ultramarine-40-aarch64.cfg Source13: ultramarine-41-x86_64.cfg Source14: ultramarine-41-aarch64.cfg +Source15: ultramarine-42-x86_64.cfg +Source16: ultramarine-42-aarch64.cfg BuildArch: noarch %description @@ -44,12 +46,16 @@ cp -v %{SOURCE11} %{buildroot}/etc/mock/ cp -v %{SOURCE12} %{buildroot}/etc/mock/ cp -v %{SOURCE13} %{buildroot}/etc/mock/ cp -v %{SOURCE14} %{buildroot}/etc/mock/ +cp -v %{SOURCE15} %{buildroot}/etc/mock/ +cp -v %{SOURCE16} %{buildroot}/etc/mock/ %files /etc/mock/* /etc/mock/templates/* %changelog +* Sat Mar 15 2025 madonuko +- Add configs for 42 * Wed Aug 08 2024 madonuko - Add configs for 41 * Thu Mar 07 2024 Lleyton Gray From b109d4cb6f1e1fdf0eb3fcfadb1dfb14b3cd6d45 Mon Sep 17 00:00:00 2001 From: madonuko Date: Sat, 15 Mar 2025 13:31:29 +0800 Subject: [PATCH 3/5] feat(kde-settings): bump to 42 --- ultramarine/kde-settings/kde-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/kde-settings/kde-settings.spec b/ultramarine/kde-settings/kde-settings.spec index daa3336..564fe7d 100644 --- a/ultramarine/kde-settings/kde-settings.spec +++ b/ultramarine/kde-settings/kde-settings.spec @@ -7,7 +7,7 @@ Summary: Config files for KDE Name: kde-settings Epoch: 1 -Version: 41 +Version: 42 Release: 5%{?dist} License: MIT From f72404552b8da55523f01169fe52f52dd77440b0 Mon Sep 17 00:00:00 2001 From: madonuko Date: Sat, 15 Mar 2025 13:32:17 +0800 Subject: [PATCH 4/5] feat(mock-configs): bump to 42 --- .../ultramarine-mock-configs/ultramarine-42-aarch64.cfg | 5 +++++ .../ultramarine-mock-configs/ultramarine-42-x86_64.cfg | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 ultramarine/ultramarine-mock-configs/ultramarine-42-aarch64.cfg create mode 100644 ultramarine/ultramarine-mock-configs/ultramarine-42-x86_64.cfg diff --git a/ultramarine/ultramarine-mock-configs/ultramarine-42-aarch64.cfg b/ultramarine/ultramarine-mock-configs/ultramarine-42-aarch64.cfg new file mode 100644 index 0000000..2e2ee8f --- /dev/null +++ b/ultramarine/ultramarine-mock-configs/ultramarine-42-aarch64.cfg @@ -0,0 +1,5 @@ +config_opts['releasever'] = '42' +config_opts['target_arch'] = 'aarch64' +config_opts['legal_host_arches'] = ('aarch64',) + +include('templates/ultramarine.tpl') diff --git a/ultramarine/ultramarine-mock-configs/ultramarine-42-x86_64.cfg b/ultramarine/ultramarine-mock-configs/ultramarine-42-x86_64.cfg new file mode 100644 index 0000000..0c50bbd --- /dev/null +++ b/ultramarine/ultramarine-mock-configs/ultramarine-42-x86_64.cfg @@ -0,0 +1,5 @@ +config_opts['releasever'] = '42' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) + +include('templates/ultramarine.tpl') From a395c531efa6629f59f92b188945f152a824518f Mon Sep 17 00:00:00 2001 From: madonuko Date: Tue, 18 Mar 2025 13:08:53 +0800 Subject: [PATCH 5/5] feat(comps): umss --- comps.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/comps.xml b/comps.xml index 8a85d42..2932aec 100644 --- a/comps.xml +++ b/comps.xml @@ -1,6 +1,19 @@ + + ultramarine-specific-stack + Ultramarine-specific Stack + Tools for Ultramarine only + false + true + + hop + dive + um + mkfstab + + default-flatpak-support