Merge branch 'frawhide' into owen/amdctl-cleanup

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

.github/workflows/bootstrap.yml

@@ -29,15 +29,6 @@ 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
@@ -46,7 +37,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,appstream-helper}/*.spec anda/{buildsys/anda,tools/subatomic}/*.spec
+        run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/{buildsys/anda,tools/subatomic}/*.spec
 
       - name: Install Anda
         run: |

anda/multimedia/LCEVCdec/LCEVCdec.spec

@@ -9,8 +9,8 @@
 %bcond docs 0
 
 Name:           LCEVCdec
-Version:        4.2.0
-Release:        1%{?dist}
+Version:        4.1.0
+Release:        2%{?dist}
 Summary:        MPEG-5 LCEVC Decoder
 License:        BSD-3-Clause-Clear
 URL:            https://docs.v-nova.com/v-nova/lcevc/lcevc-sdk-overview

anda/system/taidan/taidan.spec

@@ -1,13 +1,11 @@
 Name:           taidan
 Version:        0.2.1
-Release:        2%{?dist}
+Release:        1%{?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))
@@ -34,14 +32,6 @@ 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
@@ -61,6 +51,7 @@ 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
@@ -68,10 +59,6 @@ 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

anda/tools/amdctl/0001-RPM-makefile-Remove-unused-Makefile-variables.patch

@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paskal Sitepu <rmnscnce@ya.ru>
-Date: Sat, 4 Nov 2023 09:54:38 +0700
-Subject: [PATCH] (RPM) makefile: Remove unused Makefile variables
-
-Signed-off-by: Paskal Sitepu <rmnscnce@ya.ru>
----
- makefile | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/makefile b/makefile
-index 5ca6bab..0091429 100644
---- a/makefile
-+++ b/makefile
-@@ -1,5 +1,3 @@
--CC=gcc
--CFLAGS=-Wall -pedantic -Wextra -std=c99 -O2
- all: amdctl
- %.o: %.c
-        $(CC) -c -o $@ $< $(CFLAGS)
--- 
-2.41.0

anda/tools/amdctl/amdctl.spec

@@ -1,34 +1,40 @@
-Name: amdctl
-Summary: Set P-State voltages and clock speeds on recent AMD CPUs on Linux
-License: GPLv3
-URL: https://github.com/kevinlekiller/%{name}
+Name:       amdctl
+Summary:    Set P-State voltages and clock speeds on recent AMD CPUs on Linux
+License:    GPL-3.0-or-later
+URL:        https://github.com/kevinlekiller/%{name}
+Version:    0.11
+Release:    2%{?dist}
+Source0:    https://github.com/kevinlekiller/%{name}/archive/refs/tags/v%{version}.tar.gz
 
-Version: 0.11
-Release: 2%{?dist}
-Source0: https://github.com/kevinlekiller/%{name}/archive/refs/tags/v%{version}.tar.gz
-# Remove hardcoded CFLAGS and CC
-Patch0: 0001-RPM-makefile-Remove-unused-Makefile-variables.patch
-
-# `msr` is a builtin kernel module
-Requires: kernel-core systemd-udev coreutils
-BuildRequires: make gcc kernel-headers glibc-headers
+BuildRequires: make
+BuildRequires: gcc
+BuildRequires: kernel-headers
+BuildRequires: glibc-headers
+BuildRequires: cmake-rpm-macros
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: systemd-rpm-macros
+Requires: kernel-core
+Requires: systemd-udev
+Requires: coreutils
 
 %description
 Tool for changing voltages and clock speeds for AMD processors with
 control over every power state and CPU core.
 
 %prep
-%setup -qn %{name}-%{version}
-patch -p1 -i %{PATCH0}
+%autosetup
+
+%conf
+%cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 %build
-%set_build_flags
-%make_build
+%cmake_build
 
 %install
 # install the 'amdctl' binary
 mkdir -p %{buildroot}/%{_bindir}
-install -m 0755 ./%{name} %{buildroot}/%{_bindir}/
+install -m 0755 redhat-linux-build/%{name} %{buildroot}/%{_bindir}/
 
 # add modules.load.d entry
 mkdir -p %{buildroot}/%{_modulesloaddir}/
@@ -51,12 +57,15 @@ EOF
 %files
 %license LICENSE
 %doc README.md
-/%{_bindir}/%{name}
-/%{_libexecdir}/%{name}
-/%{_modulesloaddir}/%{name}.conf
-/%{_udevrulesdir}/99-%{name}.rules
+%{_bindir}/%{name}
+%{_libexecdir}/%{name}
+%{_modulesloaddir}/%{name}.conf
+%{_udevrulesdir}/99-%{name}.rules
 
 %changelog
+* Tue Jun 16 2026 Owen-sz <owen@fyralabs.com> - 0.11-2
+- Clean up spec
+
 * Sat Nov 4 2023 <rmnscnce@ya.ru> - 0.11-1
 - Track upstream to 0.11
 
@@ -76,4 +85,4 @@ EOF
 - Track upstream to 0.6.1
 
 * Mon May 24 2021 rmnscnce <rmnscnce@ya.ru> - 0.2-2.git+gb0ffbad
-- Initial packaging
+- Initial packaging