Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions comps.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
<comps>
<group>
<id>ultramarine-specific-stack</id>
<name>Ultramarine-specific Stack</name>
<description>Tools for Ultramarine only</description>
<default>false</default>
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">hop</packagereq>
<packagereq type="default">dive</packagereq>
<packagereq type="default">um</packagereq>
<packagereq type="default">mkfstab</packagereq>
</packagelist>
</group>
<group>
<!-- We don't include this in environment groups, to not install flatpaks that conflict with already installed RPMs during the 40 to 41 upgrade -->
<id>default-flatpak-support</id>
Expand Down
4 changes: 2 additions & 2 deletions ultramarine/kde-settings/kde-settings.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Summary: Config files for KDE
Name: kde-settings
Epoch: 1
Version: 41
Version: 42
Release: 5%{?dist}

License: MIT
Expand Down Expand Up @@ -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 <rdieter@fedoraproject.org> 4.4-1
- -pulseaudio: drop xine-lib-pulseaudio (subpkg no longer exists)
- -pulseaudio: drop xine-lib-pulseaudio (subpkg no longer exists)
10 changes: 5 additions & 5 deletions ultramarine/release/ultramarine-release.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ultramarine/repos/repos.spec
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '42'
config_opts['target_arch'] = 'aarch64'
config_opts['legal_host_arches'] = ('aarch64',)

include('templates/ultramarine.tpl')
Original file line number Diff line number Diff line change
@@ -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')
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 <mado@fyralabs.com>
- Add configs for 42
* Wed Aug 08 2024 madonuko <mado@fyralabs.com>
- Add configs for 41
* Thu Mar 07 2024 Lleyton Gray <lleyton@fyralabs.com>
Expand Down