diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e51a034..62017e39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## [Unreleased] +## [6.1.21] + +### Changed +- Kill Fedora: screw your cursed cargo bullshit +- Restore CI building + ## [6.1.20] ### Changed diff --git a/Cargo.lock b/Cargo.lock index e983d8ec..98b0b0ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,7 +164,7 @@ dependencies = [ [[package]] name = "asusctl" -version = "6.1.20" +version = "6.1.21" dependencies = [ "dmi_id", "env_logger", @@ -183,7 +183,7 @@ dependencies = [ [[package]] name = "asusd" -version = "6.1.20" +version = "6.1.21" dependencies = [ "cargo-husky", "concat-idents", @@ -210,7 +210,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "6.1.20" +version = "6.1.21" dependencies = [ "config-traits", "dirs", @@ -905,7 +905,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "6.1.20" +version = "6.1.21" dependencies = [ "log", "ron", @@ -1254,7 +1254,7 @@ dependencies = [ [[package]] name = "dmi_id" -version = "6.1.20" +version = "6.1.21" dependencies = [ "log", "udev 0.8.0", @@ -4375,7 +4375,7 @@ dependencies = [ [[package]] name = "rog-control-center" -version = "6.1.20" +version = "6.1.21" dependencies = [ "asusd", "concat-idents", @@ -4406,7 +4406,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "6.1.20" +version = "6.1.21" dependencies = [ "dmi_id", "gif 0.12.0", @@ -4420,7 +4420,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "6.1.20" +version = "6.1.21" dependencies = [ "dmi_id", "log", @@ -4431,7 +4431,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "6.1.20" +version = "6.1.21" dependencies = [ "asusd", "rog_anime", @@ -4445,7 +4445,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "6.1.20" +version = "6.1.21" dependencies = [ "concat-idents", "inotify", @@ -4458,7 +4458,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "6.1.20" +version = "6.1.21" dependencies = [ "log", "rog_platform", @@ -4469,7 +4469,7 @@ dependencies = [ [[package]] name = "rog_scsi" -version = "6.1.20" +version = "6.1.21" dependencies = [ "ron", "serde", @@ -4479,7 +4479,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "6.1.20" +version = "6.1.21" dependencies = [ "log", "rog_anime", @@ -4489,7 +4489,7 @@ dependencies = [ [[package]] name = "rog_slash" -version = "6.1.20" +version = "6.1.21" dependencies = [ "dmi_id", "serde", diff --git a/Cargo.toml b/Cargo.toml index 78d24498..f86b86c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "6.1.20" +version = "6.1.21" rust-version = "1.82" license = "MPL-2.0" readme = "README.md" diff --git a/distro-packaging/asusctl.spec b/distro-packaging/asusctl.spec deleted file mode 100755 index 73ba05b8..00000000 --- a/distro-packaging/asusctl.spec +++ /dev/null @@ -1,144 +0,0 @@ -# -# spec file for package asus-nb-ctrl -# -# Copyright (c) 2020-2025 Luke Jones -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at https://mozilla.org/MPL/2.0/. - -%if %{defined fedora} -%global debug_package %{nil} -%endif - -%define version 6.1.20 -%define specrelease %{?dist} -%define pkg_release 9%{specrelease} - -# Use hardening ldflags. -%global rustflags -Clink-arg=-Wl,-z,relro,-z,now -Name: asusctl -Version: %{version} -Release: %{pkg_release} -Summary: Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks -License: MPLv2 - -Group: System Environment/Kernel - -URL: https://gitlab.com/asus-linux/asusctl -Source: https://gitlab.com/asus-linux/asusctl/-/archive/%{version}/%{name}-%{version}.tar.gz - -%if %{defined fedora} -BuildRequires: rust-packaging -BuildRequires: systemd-rpm-macros -%else -BuildRequires: cargo-packaging -%endif -BuildRequires: git -BuildRequires: clang-devel -BuildRequires: cargo -BuildRequires: cmake -BuildRequires: rust -BuildRequires: rust-std-static -BuildRequires: pkgconfig(gbm) -BuildRequires: pkgconfig(libinput) -BuildRequires: pkgconfig(libseat) -BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(xkbcommon) -BuildRequires: pkgconfig(libzstd) -BuildRequires: desktop-file-utils - -%description -asus-nb-ctrl is a utility for Linux to control many aspects of various -ASUS laptops but can also be used with non-Asus laptops with reduced features. - -It provides an interface for rootless control of some system functions such as -fan speeds, keyboard LEDs, battery charge level, and graphics modes. -asus-nb-ctrl enables third-party apps to use the above with dbus methods. - -%package rog-gui -Summary: An experimental GUI for %{name} - -%description rog-gui -A one-stop-shop GUI tool for asusd/asusctl. It aims to provide most controls, -a notification service, and ability to run in the background. - -%prep -%autosetup -%if %{defined fedora} -%cargo_prep -sed -i 's|offline = true|offline = false|' .cargo/config.toml -sed -i 's|source.crates-io|source.ignore_this|' .cargo/config.toml -%else -mkdir -p .cargo -cat > .cargo/config.toml << 'EOF' -[term] -verbose = true -[net] -offline = false -EOF -%endif - -%build -export RUSTFLAGS="%{rustflags}" -%if %{defined fedora} -%# Use an explicit cargo invocation for Fedora to avoid the macro adding `--locked`. -%# `--locked` breaks Fedora builds because the lockfile may not be appropriate for the distro buildroot. -/usr/bin/cargo auditable build --release -%else -/usr/bin/cargo auditable build --release -%endif - -%install -export RUSTFLAGS="%{rustflags}" -mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}" -%make_install - -install -D -m 0644 README.md %{buildroot}/%{_docdir}/%{name}/README.md -install -D -m 0644 rog-anime/README.md %{buildroot}/%{_docdir}/%{name}/README-anime.md -install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}/%{_docdir}/%{name}/diagonal-template.png - -desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.desktop - -%files -%license LICENSE -%{_bindir}/asusd -%{_bindir}/asusd-user -%{_bindir}/asusctl -%{_unitdir}/asusd.service -%{_userunitdir}/asusd-user.service -%{_udevrulesdir}/99-asusd.rules -#%dir %{_sysconfdir}/asusd/ -%{_datadir}/asusd/aura_support.ron -%{_datadir}/dbus-1/system.d/asusd.conf -%{_datadir}/icons/hicolor/512x512/apps/asus_notif_yellow.png -%{_datadir}/icons/hicolor/512x512/apps/asus_notif_green.png -%{_datadir}/icons/hicolor/512x512/apps/asus_notif_red.png -%{_datadir}/icons/hicolor/512x512/apps/asus_notif_blue.png -%{_datadir}/icons/hicolor/512x512/apps/asus_notif_orange.png -%{_datadir}/icons/hicolor/512x512/apps/asus_notif_white.png -%{_datadir}/icons/hicolor/scalable/status/gpu-compute.svg -%{_datadir}/icons/hicolor/scalable/status/gpu-hybrid.svg -%{_datadir}/icons/hicolor/scalable/status/gpu-integrated.svg -%{_datadir}/icons/hicolor/scalable/status/gpu-nvidia.svg -%{_datadir}/icons/hicolor/scalable/status/gpu-vfio.svg -%{_datadir}/icons/hicolor/scalable/status/notification-reboot.svg -%{_docdir}/%{name}/ -%{_datadir}/asusd/ - -%files rog-gui -%{_bindir}/rog-control-center -%{_datadir}/applications/rog-control-center.desktop -%{_datadir}/icons/hicolor/512x512/apps/rog-control-center.png -%{_datadir}/rog-gui - -%changelog