From 57d77bdc5fe06022f2d87fc112120790867580a3 Mon Sep 17 00:00:00 2001 From: sharpenedblade Date: Sun, 29 Oct 2023 12:30:36 -0700 Subject: [PATCH] Update to v6.5.8-200.fc38 This also fixes tiny-dfr --- build-packages.sh | 2 +- kernel/kernel.sh | 2 +- rust-icon-loader/downgrade-rust-ini.patch | 6 -- rust-icon-loader/rust-icon-loader.spec | 119 ---------------------- rust-tiny-dfr/rust-tiny-dfr.spec | 29 +++--- 5 files changed, 16 insertions(+), 142 deletions(-) delete mode 100644 rust-icon-loader/downgrade-rust-ini.patch delete mode 100644 rust-icon-loader/rust-icon-loader.spec diff --git a/build-packages.sh b/build-packages.sh index eade9d5..da5f693 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash set -e -packages=( "t2linux-config" "t2linux-repo" "t2linux-audio" "rust-icon-loader" "rust-tiny-dfr" "kernel" ) +packages=( "t2linux-config" "t2linux-repo" "t2linux-audio" "rust-tiny-dfr" "kernel" ) mkdir -p /repo/builddir builddir=$(mktemp -d -p "/repo/builddir"); export builddir diff --git a/kernel/kernel.sh b/kernel/kernel.sh index 00f794c..90cb240 100755 --- a/kernel/kernel.sh +++ b/kernel/kernel.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash set -e -KERNEL_VERSION=6.5.7-200.fc38 +KERNEL_VERSION=6.5.8-200.fc38 cd "$package_builddir" koji download-build --quiet --arch=src "kernel-$KERNEL_VERSION" diff --git a/rust-icon-loader/downgrade-rust-ini.patch b/rust-icon-loader/downgrade-rust-ini.patch deleted file mode 100644 index df12254..0000000 --- a/rust-icon-loader/downgrade-rust-ini.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -35,3 +35,3 @@ - [dependencies.rust-ini] --version = "0.19.0" -+version = "0.18.0" diff --git a/rust-icon-loader/rust-icon-loader.spec b/rust-icon-loader/rust-icon-loader.spec deleted file mode 100644 index 779927d..0000000 --- a/rust-icon-loader/rust-icon-loader.spec +++ /dev/null @@ -1,119 +0,0 @@ -# Generated by rust2rpm 24 -%bcond_without check -%global debug_package %{nil} - -%global crate icon-loader - -Name: rust-icon-loader -Version: 0.4.0 -Release: %autorelease -Summary: To load and cache themed icons in 100% safe rust - -License: MIT -URL: https://crates.io/crates/icon-loader -Source: %{crates_source} - -Patch0: downgrade-rust-ini.patch - -BuildRequires: rust-packaging >= 21 - -%global _description %{expand: -Crate to load and cache themed icons in 100% safe rust.} - -%description %{_description} - -%package devel -Summary: %{summary} -BuildArch: noarch - -%description devel %{_description} - -This package contains library source intended for building other packages which -use the "%{crate}" crate. - -%files devel -%license %{crate_instdir}/LICENSE.md -%doc %{crate_instdir}/README.md -%{crate_instdir}/ - -%package -n %{name}+default-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+default-devel %{_description} - -This package contains library source intended for building other packages which -use the "default" feature of the "%{crate}" crate. - -%files -n %{name}+default-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+gtk-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+gtk-devel %{_description} - -This package contains library source intended for building other packages which -use the "gtk" feature of the "%{crate}" crate. - -%files -n %{name}+gtk-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+kde-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+kde-devel %{_description} - -This package contains library source intended for building other packages which -use the "kde" feature of the "%{crate}" crate. - -%files -n %{name}+kde-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+log-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+log-devel %{_description} - -This package contains library source intended for building other packages which -use the "log" feature of the "%{crate}" crate. - -%files -n %{name}+log-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+theme_error_log-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+theme_error_log-devel %{_description} - -This package contains library source intended for building other packages which -use the "theme_error_log" feature of the "%{crate}" crate. - -%files -n %{name}+theme_error_log-devel -%ghost %{crate_instdir}/Cargo.toml - -%prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 -%cargo_prep - -%generate_buildrequires -%cargo_generate_buildrequires - -%build -%cargo_build - -%install -%cargo_install - -%if %{with check} -%check -%cargo_test -%endif - -%changelog -%autochangelog - diff --git a/rust-tiny-dfr/rust-tiny-dfr.spec b/rust-tiny-dfr/rust-tiny-dfr.spec index ac435f7..f3a5077 100644 --- a/rust-tiny-dfr/rust-tiny-dfr.spec +++ b/rust-tiny-dfr/rust-tiny-dfr.spec @@ -1,18 +1,16 @@ %global forgeurl https://github.com/kekrby/tiny-dfr/ -%global commit 61223862921d2b1d4f88436ad9c89ddc879a5699 +%global commit 5b45724fd5e98b716d0b26a037daaaad4c7a5eee +%global crate tiny-dfr %forgemeta -Name: rust-tiny-dfr +Name: rust-%{crate} Version: 0.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The most basic dynamic function row daemon possible License: MIT AND Apache-2.0 URL: %{forgeurl} Source: %{forgesource} -# Use librsvg 2.57.0 -Patch0: fix-librsvg-metadata.patch - BuildRequires: rust-packaging >= 23 BuildRequires: systemd-rpm-macros @@ -26,10 +24,11 @@ License: Apache-2.0 AND BSD-3-Clause AND CC0-1.0 AND ISC AND LGPL-2.1-or-later A %license LICENSE.material %license LICENSE.dependencies %doc README.md -%{_bindir}/tiny-dfr -%{_datadir}/tiny-dfr/* +%{_bindir}/%{crate} +%{_datadir}/%{crate}/ %{_udevrulesdir}/*.rules -%{_unitdir}/tiny-dfr.service +%{_unitdir}/%{crate}.service +%{_sysconfdir}/%{crate}.conf %prep %forgeautosetup -p1 @@ -44,16 +43,16 @@ License: Apache-2.0 AND BSD-3-Clause AND CC0-1.0 AND ISC AND LGPL-2.1-or-later A %install %cargo_install -mkdir -p %{buildroot}%{_datadir}/ -cp -r -t %{buildroot}%{_datadir}/ share/tiny-dfr +install -Dpm0644 -t %{buildroot}%{_datadir}/%{crate} share/%{crate}/*.svg install -Dpm0644 -t %{buildroot}%{_udevrulesdir} etc/udev/rules.d/*.rules -install -Dpm0644 -t %{buildroot}%{_unitdir} etc/systemd/system/tiny-dfr.service +install -Dpm0644 -t %{buildroot}%{_unitdir} etc/systemd/system/%{crate}.service +install -Dpm0644 -t %{buildroot}%{_sysconfdir} etc/%{crate}.conf %post -%systemd_post tiny-dfr.service +%systemd_post %{crate}.service %preun -%systemd_preun tiny-dfr.service +%systemd_preun %{crate}.service %postun -%systemd_postun_with_restart tiny-dfr.service +%systemd_postun_with_restart %{crate}.service