Skip to content

Commit 57d77bd

Browse files
Update to v6.5.8-200.fc38
This also fixes tiny-dfr
1 parent 40ccd4e commit 57d77bd

5 files changed

Lines changed: 16 additions & 142 deletions

File tree

build-packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/bash
22
set -e
33

4-
packages=( "t2linux-config" "t2linux-repo" "t2linux-audio" "rust-icon-loader" "rust-tiny-dfr" "kernel" )
4+
packages=( "t2linux-config" "t2linux-repo" "t2linux-audio" "rust-tiny-dfr" "kernel" )
55

66
mkdir -p /repo/builddir
77
builddir=$(mktemp -d -p "/repo/builddir"); export builddir

kernel/kernel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/bash
22
set -e
33

4-
KERNEL_VERSION=6.5.7-200.fc38
4+
KERNEL_VERSION=6.5.8-200.fc38
55

66
cd "$package_builddir"
77
koji download-build --quiet --arch=src "kernel-$KERNEL_VERSION"

rust-icon-loader/downgrade-rust-ini.patch

Lines changed: 0 additions & 6 deletions
This file was deleted.

rust-icon-loader/rust-icon-loader.spec

Lines changed: 0 additions & 119 deletions
This file was deleted.

rust-tiny-dfr/rust-tiny-dfr.spec

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
%global forgeurl https://github.com/kekrby/tiny-dfr/
2-
%global commit 61223862921d2b1d4f88436ad9c89ddc879a5699
2+
%global commit 5b45724fd5e98b716d0b26a037daaaad4c7a5eee
3+
%global crate tiny-dfr
34
%forgemeta
45

5-
Name: rust-tiny-dfr
6+
Name: rust-%{crate}
67
Version: 0.1.2
7-
Release: 1%{?dist}
8+
Release: 2%{?dist}
89
Summary: The most basic dynamic function row daemon possible
910
License: MIT AND Apache-2.0
1011
URL: %{forgeurl}
1112
Source: %{forgesource}
1213

13-
# Use librsvg 2.57.0
14-
Patch0: fix-librsvg-metadata.patch
15-
1614
BuildRequires: rust-packaging >= 23
1715
BuildRequires: systemd-rpm-macros
1816

@@ -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
2624
%license LICENSE.material
2725
%license LICENSE.dependencies
2826
%doc README.md
29-
%{_bindir}/tiny-dfr
30-
%{_datadir}/tiny-dfr/*
27+
%{_bindir}/%{crate}
28+
%{_datadir}/%{crate}/
3129
%{_udevrulesdir}/*.rules
32-
%{_unitdir}/tiny-dfr.service
30+
%{_unitdir}/%{crate}.service
31+
%{_sysconfdir}/%{crate}.conf
3332

3433
%prep
3534
%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
4443

4544
%install
4645
%cargo_install
47-
mkdir -p %{buildroot}%{_datadir}/
48-
cp -r -t %{buildroot}%{_datadir}/ share/tiny-dfr
46+
install -Dpm0644 -t %{buildroot}%{_datadir}/%{crate} share/%{crate}/*.svg
4947
install -Dpm0644 -t %{buildroot}%{_udevrulesdir} etc/udev/rules.d/*.rules
50-
install -Dpm0644 -t %{buildroot}%{_unitdir} etc/systemd/system/tiny-dfr.service
48+
install -Dpm0644 -t %{buildroot}%{_unitdir} etc/systemd/system/%{crate}.service
49+
install -Dpm0644 -t %{buildroot}%{_sysconfdir} etc/%{crate}.conf
5150

5251
%post
53-
%systemd_post tiny-dfr.service
52+
%systemd_post %{crate}.service
5453

5554
%preun
56-
%systemd_preun tiny-dfr.service
55+
%systemd_preun %{crate}.service
5756

5857
%postun
59-
%systemd_postun_with_restart tiny-dfr.service
58+
%systemd_postun_with_restart %{crate}.service

0 commit comments

Comments
 (0)