[rpms/rust-tiny-dfr] epel10: Update to 0.3.2; Fixes: RHBZ#2293764

[rpms/rust-tiny-dfr] epel10: Update to 0.3.2; Fixes: RHBZ#2293764

[Davide Cavalca]

A new commit has been pushed.

Repo   : rpms/rust-tiny-dfr
Branch : epel10
Commit : a19b83d90a79964fcb74d198bec9e280d8cd4c05
Author : Davide Cavalca <dcavalca@fedoraproject.org>
Date   : 2024-10-12T08:36:12-07:00
Stats  : +24/-45 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-tiny-dfr/c/a19b83d90a79964fcb74d198bec9e280d8cd4c05?branch=epel10

Log:
Update to 0.3.2; Fixes: RHBZ#2293764

---
diff --git a/.gitignore b/.gitignore
index dc0b455..5c39c2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /tiny-dfr-0.1.1.crate
 /tiny-dfr-0.1.2.crate
 /tiny-dfr-0.2.0.crate
+/tiny-dfr-0.3.2.crate

diff --git a/rust-tiny-dfr.spec b/rust-tiny-dfr.spec
index 752d545..91bbcfa 100644
--- a/rust-tiny-dfr.spec
+++ b/rust-tiny-dfr.spec
@@ -4,21 +4,13 @@
 %global crate tiny-dfr
 
 Name:           rust-tiny-dfr
-Version:        0.2.0
+Version:        0.3.2
 Release:        %autorelease
 Summary:        Most basic dynamic function row daemon possible
 
 License:        MIT AND Apache-2.0
 URL:            https://crates.io/crates/tiny-dfr
 Source:         %{crates_source}
-# Manually created patch for downstream crate metadata changes
-# * bump cairo-rs dependency from 0.18 to 0.19
-# * bump drm dependency from 0.10 to 0.11:
-#   https://github.com/WhatAmISupposedToPutHere/tiny-dfr/pull/30
-# * bump freetype-rs dependency from 0.32 to 0.35
-# * restrict librsvg dependency from 2.56 to ~2.58:
-#   the librsvg crate does not follow SemVer versioning
-Patch:          tiny-dfr-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  systemd-rpm-macros
@@ -39,6 +31,7 @@ Summary:        %{summary}
 # Apache-2.0
 # Apache-2.0 OR MIT
 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSD-2-Clause OR Apache-2.0 OR MIT
 # ISC
 # LGPL-2.1-or-later
 # MIT
@@ -49,7 +42,7 @@ Summary:        %{summary}
 # MPL-2.0
 # Unlicense OR MIT
 # Zlib OR Apache-2.0 OR MIT
-License:        Apache-2.0 AND BSD-3-Clause AND ISC AND LGPL-2.1-or-later AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
+License:        ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND ISC AND LGPL-2.1-or-later AND MIT AND (MIT AND Apache-2.0) AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
 # LICENSE.dependencies contains a full license breakdown
 
 %description -n %{crate} %{_description}
@@ -80,10 +73,7 @@ License:        Apache-2.0 AND BSD-3-Clause AND ISC AND LGPL-2.1-or-later AND MI
 
 %install
 %cargo_install
-
-install -Dpm0644 -t %{buildroot}%{_datadir}/%{crate} \
-  share/%{crate}/*.svg \
-  share/%{crate}/config.toml
+install -Dpm0644 -t %{buildroot}%{_datadir}/%{crate} share/%{crate}/*.svg share/%{crate}/config.toml
 install -Ddpm0755 %{buildroot}%{_sysconfdir}/%{crate}
 touch %{buildroot}%{_sysconfdir}/%{crate}/config.toml
 install -Dpm0644 -t %{buildroot}%{_udevrulesdir} etc/udev/rules.d/*.rules

diff --git a/rust2rpm.toml b/rust2rpm.toml
index d7ad328..679c015 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,2 +1,20 @@
+[package]
+extra-files = [
+  "%{_datadir}/%{crate}/",
+  "%{_udevrulesdir}/*.rules",
+  "%{_unitdir}/%{crate}.service",
+  "%dir %{_sysconfdir}/%{crate}/",
+  "%config(noreplace) %ghost %{_sysconfdir}/%{crate}/config.toml",
+]
+
 [requires]
 build = ["systemd-rpm-macros"]
+
+[scripts]
+install.post = [
+  "install -Dpm0644 -t %{buildroot}%{_datadir}/%{crate} share/%{crate}/*.svg share/%{crate}/config.toml",
+  "install -Ddpm0755 %{buildroot}%{_sysconfdir}/%{crate}",
+  "touch %{buildroot}%{_sysconfdir}/%{crate}/config.toml",
+  "install -Dpm0644 -t %{buildroot}%{_udevrulesdir} etc/udev/rules.d/*.rules",
+  "install -Dpm0644 -t %{buildroot}%{_unitdir} etc/systemd/system/%{crate}.service",
+]

diff --git a/sources b/sources
index 92f16fe..e09d64d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tiny-dfr-0.2.0.crate) = 83454f63be0db2b0f80570a3440319a5f175e9eb64b711915ab0dc86c7eb4c6ea5c2c284efb89923307ac44fc677ec249d5c135a985f3849227aa80350ca8c70
+SHA512 (tiny-dfr-0.3.2.crate) = c735f066cf572492261ce58a17472e6daa61e69f627c097dbb091614a954347ac07b811d02f9434bf7431ea2d805a68c7203c01ecf68833bf5bd3f27ca49748f

diff --git a/tiny-dfr-fix-metadata.diff b/tiny-dfr-fix-metadata.diff
deleted file mode 100644
index 29a4e00..0000000
--- a/tiny-dfr-fix-metadata.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- tiny-dfr-0.2.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ tiny-dfr-0.2.0/Cargo.toml	2024-04-02T12:59:15.516225+00:00
-@@ -23,15 +23,15 @@
- version = "1"
- 
- [dependencies.cairo-rs]
--version = "0.18"
-+version = "0.19"
- features = ["freetype"]
- default-features = false
- 
- [dependencies.drm]
--version = "0.10.0"
-+version = "0.11.1"
- 
- [dependencies.freetype-rs]
--version = "0.32"
-+version = "0.35"
- 
- [dependencies.input]
- version = "0.8"
-@@ -47,7 +47,7 @@
- version = "0.2"
- 
- [dependencies.librsvg]
--version = "2.56.0"
-+version = "~2.58"
- 
- [dependencies.nix]
- version = "0.27"