From d85bc3ec09ce0d4c10e438d7b765b434425209de Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Tue, 16 Jun 2026 11:39:05 -0500
Subject: [PATCH] feat(taidan): default-configs subpackage (#13042) (#13119)

* fix(ci/bootstrap): update buildsys dir path

* feat(taidan): default-configs subpackage

* fix(ci/bootstrap): set `%dist` and build env properly

* Update taidan.spec



* noarch



---------


(cherry picked from commit 99f6c6f56f0ee4518d3fa624523913679cebfd14)

Signed-off-by: madomado <madonuko@outlook.com>
Co-authored-by: madomado <madonuko@outlook.com>
---
 .github/workflows/bootstrap.yml | 11 ++++++++++-
 anda/system/taidan/taidan.spec  | 17 +++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index f0a4f6da14..8923f63f41 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -29,6 +29,15 @@ jobs:
           ref: f${{ matrix.version }}
           fetch-depth: 1
 
+      - name: Setup build environment
+        run: |
+          sed -i 's/.fc%{fedora}/.fcrawhide/g' /usr/lib/rpm/macros.d/macros.dist
+          cat<<EOF >> /etc/dnf/dnf.conf
+          gpgcheck=1
+          install_weak_deps=0
+          max_parallel_downloads=20
+          EOF
+
       - name: Build anda-srpm-macros
         run: |
           mkdir -p anda-build/rpm/rpms
@@ -37,7 +46,7 @@ jobs:
           dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm
 
       - name: Install build dependencies
-        run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/{buildsys/anda,tools/subatomic}/*.spec
+        run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros,appstream-helper}/*.spec anda/{buildsys/anda,tools/subatomic}/*.spec
 
       - name: Install Anda
         run: |
diff --git a/anda/system/taidan/taidan.spec b/anda/system/taidan/taidan.spec
index 757c922208..7e43c41a9c 100644
--- a/anda/system/taidan/taidan.spec
+++ b/anda/system/taidan/taidan.spec
@@ -1,11 +1,13 @@
 Name:           taidan
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Out-Of-Box-Experience (OOBE) and Welcome App
 SourceLicense:  GPL-3.0-or-later AND GPL-2.0-or-later
 License:        (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND Unicode-3.0 AND (Unlicense OR MIT) AND Zlib AND GPL-3.0-or-later AND GPL-2.0-or-later
 URL:            https://github.com/Ultramarine-Linux/taidan
 Packager:       Terra Packaging Team <terra@fyralabs.com>
+Requires:       %name-configs
+Suggests:       %name-default-configs
 Conflicts:      initial-setup
 Requires:       dbus-daemon
 Requires:       (glib2 or (/usr/bin/plasma-apply-colorscheme and kf6-kconfig))
@@ -32,6 +34,14 @@ BuildRequires:  glibc-all-langpacks
 Taidan is a GUI Out-Of-Box-Experience (OOBE) and Welcome App for Ultramarine
 Linux, written in Rust and the Helium toolkit.
 
+%package default-configs
+Summary:        Default configurations for Taidan
+Provides:       %name-configs
+BuildArch:      noarch
+
+%description default-configs
+This package contains the default configuration files for taidan.
+
 %prep
 %git_clone
 %cargo_prep_online
@@ -51,7 +61,6 @@ DESTDIR=%buildroot ./scripts/install.sh
 %_datadir/polkit-1/rules.d/100-taidan.rules
 %_datadir/taidan/
 %_presetdir/95-taidan.preset
-%_sysconfdir/com.fyralabs.Taidan/
 %_sysconfdir/pam.d/taidan
 %_sysusersdir/taidan.conf
 %_unitdir/taidan-initial-setup.service
@@ -59,6 +68,10 @@ DESTDIR=%buildroot ./scripts/install.sh
 %dir %_prefix/lib/taidan/
 %_prefix/lib/taidan/labwc/*
 
+%files default-configs
+%config %_sysconfdir/com.fyralabs.Taidan/
+%config %_datadir/taidan/
+
 %changelog
 * Sun Mar 15 2026 Tulip Blossom <tulilirockz@outlook.com>
 - Add dbus-daemon as runtime dependency