diff --git a/.gitignore b/.gitignore index 469f9c2..e7b040c 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,6 @@ /stratisd-3.5.1.tar.gz /stratisd-3.5.1-vendor.tar.gz /stratisd-3.5.1.crate +/stratisd-3.5.2.tar.gz +/stratisd-3.5.2-vendor.tar.gz +/stratisd-3.5.2.crate diff --git a/sources b/sources index 64c52cc..8d89b48 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (stratisd-3.5.1.tar.gz) = 4aae8ff170ac0c2d8964d87172c4ff5bf3a82c93d4cc5f4b4df5fe32ddb06e7f3717cbba3899473f22724acd590d1f47fe5c5c17bef5d427044d1b0ac342395e -SHA512 (stratisd-3.5.1-vendor.tar.gz) = 1ac933630bd3a12c082d1ff0afb48498295c39a23cf427e7347a80a9d256f88df052ea2ee74415b41c7f3c081189c728b87f034a435f49bb92690ec68ecd9cbb -SHA512 (stratisd-3.5.1.crate) = f9242c553f1537754a974440785ff67bd196cc6378b6bbcba96fb86674f715d065bcdf284355ba8a22ceace20542770889182cfbee98a54d37f9b23587df7d13 +SHA512 (stratisd-3.5.2.tar.gz) = 564c695ce55e716808871ffc9ff2eac069d8ec734198c1a4a2a24c43a811472f412011d2cfdf282f375f5b20db5daf165d8d561f981305b48adc351bfef3ae54 +SHA512 (stratisd-3.5.2-vendor.tar.gz) = ccddb3157cefd8b175f706ce1a69acd2866efc521dc776cf34197666e2c2672d6be5e71ddea3159c9ea9c831f3a1d357dba2f62fb454d616aa8ad512dffc8e48 +SHA512 (stratisd-3.5.2.crate) = ce967587a2f64f0f8526e5610864132427493b37bef9511189c866a331e41978036a30de6d8bb391b533edd3ea5f00ed199bf9b3056d6ee9a989fa5dbb1ffccb diff --git a/stratisd.spec b/stratisd.spec index 69fd505..f9e3bf9 100644 --- a/stratisd.spec +++ b/stratisd.spec @@ -4,8 +4,8 @@ %global dracutdir %(pkg-config --variable=dracutdir dracut) Name: stratisd -Version: 3.5.1 -Release: 3%{?dist} +Version: 3.5.2 +Release: 1%{?dist} Summary: Daemon that manages block devices to create filesystems # ASL 2.0 @@ -75,6 +75,16 @@ Requires: plymouth %description dracut %{summary}. +%package tools +Summary: Tools that support Stratis operation + +ExclusiveArch: %{rust_arches} + +Requires: stratisd + +%description tools +%{summary}. + %prep %setup -q tar --strip-components=1 --extract --verbose --file %{SOURCE2} @@ -85,7 +95,7 @@ tar --strip-components=1 --extract --verbose --file %{SOURCE2} %else %cargo_prep %generate_buildrequires -%cargo_generate_buildrequires -f engine,dbus_enabled,min,systemd_compat +%cargo_generate_buildrequires -f engine,dbus_enabled,min,systemd_compat,extras %endif %build @@ -94,13 +104,16 @@ tar --strip-components=1 --extract --verbose --file %{SOURCE2} %{__cargo} build %{?_smp_mflags} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features engine,min,systemd_compat %{__cargo} rustc %{?_smp_mflags} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static %{__cargo} rustc %{?_smp_mflags} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static +%{__cargo} build %{?_smp_mflags} --release --bin=stratis-dumpmetadata --no-default-features --features engine,extras,min %else %{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd %{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features engine,min,systemd_compat %{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static %{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static +%{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-dumpmetadata --no-default-features --features engine,extras,min %endif a2x -f manpage docs/stratisd.txt +a2x -f manpage docs/stratis-dumpmetadata.txt %install %make_install DRACUTDIR=%{dracutdir} PROFILEDIR=release @@ -154,7 +167,15 @@ a2x -f manpage docs/stratisd.txt %{_systemd_util_dir}/system-generators/stratis-clevis-setup-generator %{_systemd_util_dir}/system-generators/stratis-setup-generator +%files tools +%license LICENSE +%{_bindir}/stratis-dumpmetadata +%{_mandir}/man8/stratis-dumpmetadata.8* + %changelog +* Fri Mar 17 2023 Bryan Gurney - 3.5.2-1 +- Update to 3.5.2 + * Tue Feb 28 2023 Bryan Gurney - 3.5.1-3 - Allow annocheck on rpminspect.yaml for non-static binaries diff --git a/tests/tests.yml b/tests/tests.yml index 6cbf339..d0b74f5 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -15,4 +15,4 @@ repositories: - repo: "https://github.com/stratis-storage/testing.git" dest: "testing" - version: "v3.5.0" + version: "v3.5.1"