From fa530308ea877d6285e5ecb156cc172d49346b2a Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Fri, 11 Oct 2024 16:42:30 -0700 Subject: [PATCH] Update to 1.0.2; Fixes: RHBZ#2302225 --- .gitignore | 1 + rust-speakersafetyd.spec | 24 +++++++++++++++--------- rust2rpm.toml | 20 ++++++++++++++++++++ sources | 2 +- 4 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index cc6b397..c3c5d2c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /speakersafetyd-0.1.7.crate /speakersafetyd-0.1.8.crate /speakersafetyd-0.1.9.crate +/speakersafetyd-1.0.2.crate diff --git a/rust-speakersafetyd.spec b/rust-speakersafetyd.spec index af33926..ad40fe4 100644 --- a/rust-speakersafetyd.spec +++ b/rust-speakersafetyd.spec @@ -1,10 +1,10 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 26 %bcond_without check %global crate speakersafetyd Name: rust-speakersafetyd -Version: 0.1.9 +Version: 1.0.2 Release: %autorelease Summary: Speaker protection daemon for embedded Linux systems @@ -22,7 +22,13 @@ Speaker protection daemon for embedded Linux systems.} %package -n %{crate} Summary: %{summary} -License: MIT AND (Apache-2.0 OR MIT) AND (MIT OR LGPL-3.0-or-later) AND MPL-2.0 +# Apache-2.0 OR MIT +# MIT +# MIT OR Apache-2.0 +# MIT OR LGPL-3.0-or-later +# MPL-2.0 +License: (Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR LGPL-3.0-or-later) AND MPL-2.0 +# LICENSE.dependencies contains a full license breakdown Requires: systemd-udev %description -n %{crate} %{_description} @@ -38,7 +44,7 @@ Requires: systemd-udev %{_udevrulesdir}/95-speakersafetyd.rules %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -56,11 +62,6 @@ install -p -m 0644 -D 95-speakersafetyd.rules %{buildroot}%{_udevrulesdir}/95-sp install -d -m 0755 %{buildroot}%{_datadir}/speakersafetyd/apple install -p -m 0644 -t %{buildroot}%{_datadir}/speakersafetyd/apple conf/apple/* install -d -m 0755 %{buildroot}%{_sharedstatedir}/speakersafetyd/blackbox - -%if %{with check} -%check -%cargo_test -%endif %post -n %{crate} %systemd_post speakersafetyd.service @@ -71,5 +72,10 @@ install -d -m 0755 %{buildroot}%{_sharedstatedir}/speakersafetyd/blackbox %postun -n %{crate} %systemd_postun_with_restart speakersafetyd.service +%if %{with check} +%check +%cargo_test +%endif + %changelog %autochangelog diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..c603670 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,20 @@ +[package] +extra-files = [ + "%{_datadir}/speakersafetyd/", + "%{_unitdir}/speakersafetyd.service", + "%{_sharedstatedir}/speakersafetyd/", + "%{_udevrulesdir}/95-speakersafetyd.rules", +] + +[requires] +build = ["systemd-rpm-macros"] +bin = ["systemd-udev"] + +[scripts] +install.post = [ + "install -p -m 0644 -D speakersafetyd.service %{buildroot}%{_unitdir}/speakersafetyd.service", + "install -p -m 0644 -D 95-speakersafetyd.rules %{buildroot}%{_udevrulesdir}/95-speakersafetyd.rules", + "install -d -m 0755 %{buildroot}%{_datadir}/speakersafetyd/apple", + "install -p -m 0644 -t %{buildroot}%{_datadir}/speakersafetyd/apple conf/apple/*", + "install -d -m 0755 %{buildroot}%{_sharedstatedir}/speakersafetyd/blackbox", +] diff --git a/sources b/sources index c4cb61d..b1b282d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (speakersafetyd-0.1.9.crate) = dd4f7ed488e8fa8836647a08760b41e04983e9c070e5ba34e10b37c0ed2f2e199c592fa2b527e1159cd4a7d6f67fc317341c3b6c2b0b565a55788c4c0e1ee0bd +SHA512 (speakersafetyd-1.0.2.crate) = 4e370862d2d1da6e132d0833c4238f7dbba1f891bcb31301129f9e3408065d39cb78d109de04b4169a90011a6e6fa8f1a5f9181d700ab6db5465dcceef0369a5