.gitignore

@@ -1,2 +1,3 @@
-SOURCES/stratisd-3.6.7-vendor.tar.gz
+SOURCES/stratisd-3.5.8-vendor.tar.gz
-SOURCES/stratisd-3.6.7.tar.gz
+SOURCES/stratisd-3.5.8.crate
+SOURCES/stratisd-3.5.8.tar.gz

.stratisd.metadata

@@ -1,2 +1,3 @@
-9e520a40f2212e8edffb3756e946eb123b201c1d SOURCES/stratisd-3.6.7-vendor.tar.gz
+7db20a706ac0e878eac74b879a248bce9b833013 SOURCES/stratisd-3.5.8-vendor.tar.gz
-31b7c08969c8ef0349388d74a9a307fbaa2f850c SOURCES/stratisd-3.6.7.tar.gz
+7275cca97e0036b5310d601cb4763a7693c37578 SOURCES/stratisd-3.5.8.crate
+9aa3f208e50ddf73bb6a6b0e99181e86bced2c7f SOURCES/stratisd-3.5.8.tar.gz

SOURCES/vendor-serde_derive.patch

@@ -0,0 +1,51 @@
+diff -r -u a/vendor/serde_derive/.cargo-checksum.json b/vendor/serde_derive/.cargo-checksum.json
+--- a/vendor/serde_derive/.cargo-checksum.json	2023-07-28 17:29:31.882146916 -0400
++++ b/vendor/serde_derive/.cargo-checksum.json	2023-07-28 17:29:18.104951995 -0400
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"341a4425e672c1fc4571d37a0dddb54b35b4bdcf38c550af47c3c1f16426564b","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","serde_derive-x86_64-unknown-linux-gnu":"352a33dfb4b10e7beabef977b83fdd697e4443f27e03a6aceff8c3738edc30d5","src/bound.rs":"fee590a67ca956d7a2fca50a2dc069e71d27fa9adacde98670a88245a8841cf6","src/buffer.rs":"b2bbe4058cd60c2ccbbe5087516224d2975a38dbf9fb52c25f23c1b96c9f1ea7","src/bytecode.rs":"4b092d9d88e11dd544c14decb64ab50a1725f0f792adf6b69aeebaabc2919097","src/de.rs":"1ebe3d3fabd86bdfe15e7aed02d7ecd183353c276ce8e6302264740191965c74","src/dummy.rs":"1b7de5bfe1158ea7e70d668d4f76fdccf7f63144ac7869e82e8bf1e7ea0db13c","src/fragment.rs":"5548ba65a53d90a296f60c1328a7a7fb040db467f59c2f5210b2fb320457145d","src/internals/ast.rs":"07dfd9a789cd6268c2cff2889e738193d24e68c93873792a0548d5e6b3c94ca4","src/internals/attr.rs":"55b59fb42ac041ec44c34dfa58e2c11d37783fa4f5200fbd8520fe28d798eff7","src/internals/case.rs":"9492f0c5142d7b7e8cd39c86d13a855e5ce4489425adb2b96aed89e1b7851ac0","src/internals/check.rs":"41f4725b20919b8828850529d8d395dbb55f54ca4069a9cd0bf37109e9b93172","src/internals/ctxt.rs":"c403db8260a533e58af06e8d0a2bb962edb13a250424ab1f1fd2719902affc37","src/internals/mod.rs":"f32138ff19d57eb00f88ba11f6b015efab2102657804f71ebbf386a3698dad91","src/internals/receiver.rs":"6b016351b8294539039095863d8c99e81dd4530d7f769003d12d4ca73cca172c","src/internals/respan.rs":"899753859c58ce5f532a3ec4584796a52f13ed5a0533191e48c953ba5c1b52ff","src/internals/symbol.rs":"2bf0287da64d28da7e8673af60f66aaf6b29efe33131e56b24d6fa55edb533ad","src/lib.rs":"8fa0a5bbcc1126f29d5b5e69459c1510e47c607342a000d833ec382afb7848ea","src/lib_from_source.rs":"72960c007813da84dbcc2d98398e3bfb6c0617c29ffe456cf184c2a556d2e6e4","src/lib_precompiled.rs":"68cd898c82ecca3770fcda43c6514b967222e75ba2d4d618ad3925e34181ef21","src/pretend.rs":"0e570faf787015535ea6b6683ebc271633c1ca945d3ee1d072c497a1a920c380","src/ser.rs":"e435dc7ef8ee9dca02913f43b4162d22c664061510089745b6278a63df7d30fe","src/this.rs":"a2c128955324c2994ed7cdc3fe4eeceb7ad8a0f9d071665a8378c85c8df64ce2","src/try.rs":"b171b0088c23ebf4bfa07ba457881b41ac5e547d55dd16f737ea988d34badf61"},"package":"b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"}
+\ No newline at end of file
++{"files":{"Cargo.toml":"77728000015e4d5b8932e7683214d185fa8af037032eaf98e17a45fbaf0964ed","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","src/bound.rs":"fee590a67ca956d7a2fca50a2dc069e71d27fa9adacde98670a88245a8841cf6","src/buffer.rs":"b2bbe4058cd60c2ccbbe5087516224d2975a38dbf9fb52c25f23c1b96c9f1ea7","src/bytecode.rs":"4b092d9d88e11dd544c14decb64ab50a1725f0f792adf6b69aeebaabc2919097","src/de.rs":"1ebe3d3fabd86bdfe15e7aed02d7ecd183353c276ce8e6302264740191965c74","src/dummy.rs":"1b7de5bfe1158ea7e70d668d4f76fdccf7f63144ac7869e82e8bf1e7ea0db13c","src/fragment.rs":"5548ba65a53d90a296f60c1328a7a7fb040db467f59c2f5210b2fb320457145d","src/internals/ast.rs":"07dfd9a789cd6268c2cff2889e738193d24e68c93873792a0548d5e6b3c94ca4","src/internals/attr.rs":"55b59fb42ac041ec44c34dfa58e2c11d37783fa4f5200fbd8520fe28d798eff7","src/internals/case.rs":"9492f0c5142d7b7e8cd39c86d13a855e5ce4489425adb2b96aed89e1b7851ac0","src/internals/check.rs":"41f4725b20919b8828850529d8d395dbb55f54ca4069a9cd0bf37109e9b93172","src/internals/ctxt.rs":"c403db8260a533e58af06e8d0a2bb962edb13a250424ab1f1fd2719902affc37","src/internals/mod.rs":"f32138ff19d57eb00f88ba11f6b015efab2102657804f71ebbf386a3698dad91","src/internals/receiver.rs":"6b016351b8294539039095863d8c99e81dd4530d7f769003d12d4ca73cca172c","src/internals/respan.rs":"899753859c58ce5f532a3ec4584796a52f13ed5a0533191e48c953ba5c1b52ff","src/internals/symbol.rs":"2bf0287da64d28da7e8673af60f66aaf6b29efe33131e56b24d6fa55edb533ad","src/lib.rs":"cb97725dce0245fc369a81c9328960225324b489792693a3830aa174f3c977f4","src/lib_from_source.rs":"72960c007813da84dbcc2d98398e3bfb6c0617c29ffe456cf184c2a556d2e6e4","src/lib_precompiled.rs":"68cd898c82ecca3770fcda43c6514b967222e75ba2d4d618ad3925e34181ef21","src/pretend.rs":"0e570faf787015535ea6b6683ebc271633c1ca945d3ee1d072c497a1a920c380","src/ser.rs":"e435dc7ef8ee9dca02913f43b4162d22c664061510089745b6278a63df7d30fe","src/this.rs":"a2c128955324c2994ed7cdc3fe4eeceb7ad8a0f9d071665a8378c85c8df64ce2","src/try.rs":"b171b0088c23ebf4bfa07ba457881b41ac5e547d55dd16f737ea988d34badf61"},"package":"b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"}
+diff -r -u a/vendor/serde_derive/Cargo.toml b/vendor/serde_derive/Cargo.toml
+--- a/vendor/serde_derive/Cargo.toml	2023-07-28 17:29:31.882146916 -0400
++++ b/vendor/serde_derive/Cargo.toml	2023-07-28 17:29:18.104951995 -0400
+@@ -45,18 +45,18 @@
+ [lib]
+ proc-macro = true
+ 
+-[dev-dependencies.serde]
++[dependencies.proc-macro2]
+ version = "1"
+ 
+-[features]
+-default = []
+-deserialize_in_place = []
+-
+-[target."cfg(not(all(target_arch = \"x86_64\", target_os = \"linux\", target_env = \"gnu\")))".dependencies.proc-macro2]
++[dependencies.quote]
+ version = "1"
+ 
+-[target."cfg(not(all(target_arch = \"x86_64\", target_os = \"linux\", target_env = \"gnu\")))".dependencies.quote]
++[dependencies.syn]
++version = "2.0.25"
++
++[dev-dependencies.serde]
+ version = "1"
+ 
+-[target."cfg(not(all(target_arch = \"x86_64\", target_os = \"linux\", target_env = \"gnu\")))".dependencies.syn]
+-version = "2.0.25"
++[features]
++default = []
++deserialize_in_place = []
+Only in a/vendor/serde_derive: serde_derive-x86_64-unknown-linux-gnu
+diff -r -u a/vendor/serde_derive/src/lib.rs b/vendor/serde_derive/src/lib.rs
+--- a/vendor/serde_derive/src/lib.rs	2023-07-28 17:29:31.882146916 -0400
++++ b/vendor/serde_derive/src/lib.rs	2023-07-28 17:29:18.104951995 -0400
+@@ -18,8 +18,4 @@
+ 
+ extern crate proc_macro;
+ 
+-#[cfg(not(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu")))]
+ include!("lib_from_source.rs");
+-
+-#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
+-include!("lib_precompiled.rs");

SPECS/stratisd.spec

@@ -4,7 +4,7 @@
 %global dracutdir %(pkg-config --variable=dracutdir dracut)
 
 Name:           stratisd
-Version:        3.6.7
+Version:        3.5.8
 Release:        1%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
@@ -12,7 +12,9 @@ License:        MPL-2.0
 URL:            https://github.com/stratis-storage/stratisd
 Source0:        %{url}/archive/stratisd-v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{url}/releases/download/stratisd-v%{version}/%{name}-%{version}-vendor.tar.gz
+Source2:        %{crates_source}
 
+Patch0:         vendor-serde_derive.patch
 
 ExclusiveArch:  %{rust_arches}
 %if 0%{?rhel}
@@ -51,150 +53,6 @@ Requires:       libblkid
 # that it uses to have been built in an environment with cryptsetup >= 2.6.0.
 Recommends:     clevis-luks >= 18
 
-Provides: bundled(crate(aho-corasick)) = 1.0.2
-Provides: bundled(crate(anstream)) = 0.6.13
-Provides: bundled(crate(anstream)) = 0.3.2
-Provides: bundled(crate(anstyle)) = 1.0.6
-Provides: bundled(crate(anstyle-parse)) = 0.2.1
-Provides: bundled(crate(anstyle-query)) = 1.0.0
-Provides: bundled(crate(assert_cmd)) = 2.0.11
-Provides: bundled(crate(assert_matches)) = 1.5.0
-Provides: bundled(crate(async-trait)) = 0.1.68
-Provides: bundled(crate(autocfg)) = 1.1.0
-Provides: bundled(crate(bit-set)) = 0.5.3
-Provides: bundled(crate(bit-vec)) = 0.6.3
-Provides: bundled(crate(bitflags)) = 2.4.0
-Provides: bundled(crate(bitflags)) = 1.3.2
-Provides: bundled(crate(block-buffer)) = 0.10.4
-Provides: bundled(crate(bstr)) = 1.5.0
-Provides: bundled(crate(byteorder)) = 1.4.3
-Provides: bundled(crate(cc)) = 1.0.79
-Provides: bundled(crate(cexpr)) = 0.6.0
-Provides: bundled(crate(cfg-if)) = 1.0.0
-Provides: bundled(crate(cfg-if)) = 0.1.10
-Provides: bundled(crate(cfg_aliases)) = 0.1.1
-Provides: bundled(crate(chrono)) = 0.4.26
-Provides: bundled(crate(clang-sys)) = 1.6.1
-Provides: bundled(crate(clap)) = 4.3.5
-Provides: bundled(crate(clap_builder)) = 4.3.5
-Provides: bundled(crate(clap_lex)) = 0.5.0
-Provides: bundled(crate(colorchoice)) = 1.0.0
-Provides: bundled(crate(cpufeatures)) = 0.2.8
-Provides: bundled(crate(crc)) = 3.0.1
-Provides: bundled(crate(crc-catalog)) = 2.2.0
-Provides: bundled(crate(crypto-common)) = 0.1.6
-Provides: bundled(crate(data-encoding)) = 2.4.0
-Provides: bundled(crate(dbus)) = 0.9.7
-Provides: bundled(crate(dbus-tree)) = 0.9.2
-Provides: bundled(crate(devicemapper)) = 0.34.2
-Provides: bundled(crate(devicemapper-sys)) = 0.3.0
-Provides: bundled(crate(difflib)) = 0.4.0
-Provides: bundled(crate(digest)) = 0.10.7
-Provides: bundled(crate(doc-comment)) = 0.3.3
-Provides: bundled(crate(either)) = 1.8.1
-Provides: bundled(crate(env_filter)) = 0.1.0
-Provides: bundled(crate(env_logger)) = 0.11.2
-Provides: bundled(crate(errno)) = 0.3.1
-Provides: bundled(crate(fastrand)) = 1.9.0
-Provides: bundled(crate(float-cmp)) = 0.9.0
-Provides: bundled(crate(futures)) = 0.3.28
-Provides: bundled(crate(futures-channel)) = 0.3.28
-Provides: bundled(crate(futures-core)) = 0.3.28
-Provides: bundled(crate(futures-executor)) = 0.3.28
-Provides: bundled(crate(futures-io)) = 0.3.28
-Provides: bundled(crate(futures-macro)) = 0.3.28
-Provides: bundled(crate(futures-sink)) = 0.3.28
-Provides: bundled(crate(futures-task)) = 0.3.28
-Provides: bundled(crate(futures-util)) = 0.3.28
-Provides: bundled(crate(generic-array)) = 0.14.7
-Provides: bundled(crate(getrandom)) = 0.2.10
-Provides: bundled(crate(glob)) = 0.3.1
-Provides: bundled(crate(humantime)) = 2.1.0
-Provides: bundled(crate(iana-time-zone)) = 0.1.57
-Provides: bundled(crate(io-lifetimes)) = 1.0.11
-Provides: bundled(crate(iocuddle)) = 0.1.1
-Provides: bundled(crate(is-terminal)) = 0.4.7
-Provides: bundled(crate(itertools)) = 0.12.0
-Provides: bundled(crate(itertools)) = 0.10.5
-Provides: bundled(crate(itoa)) = 1.0.6
-Provides: bundled(crate(lazy_static)) = 1.4.0
-Provides: bundled(crate(lazycell)) = 1.3.0
-Provides: bundled(crate(libblkid-rs)) = 0.3.2
-Provides: bundled(crate(libblkid-rs-sys)) = 0.3.0
-Provides: bundled(crate(libc)) = 0.2.153
-Provides: bundled(crate(libcryptsetup-rs)) = 0.9.3
-Provides: bundled(crate(libcryptsetup-rs-sys)) = 0.4.0
-Provides: bundled(crate(libdbus-sys)) = 0.2.5
-Provides: bundled(crate(libloading)) = 0.7.4
-Provides: bundled(crate(libm)) = 0.2.7
-Provides: bundled(crate(libmount)) = 0.1.15
-Provides: bundled(crate(libudev)) = 0.3.0
-Provides: bundled(crate(libudev-sys)) = 0.1.4
-Provides: bundled(crate(linux-raw-sys)) = 0.3.8
-Provides: bundled(crate(log)) = 0.4.19
-Provides: bundled(crate(loopdev-3)) = 0.5.1
-Provides: bundled(crate(memchr)) = 2.5.0
-Provides: bundled(crate(memoffset)) = 0.9.0
-Provides: bundled(crate(minimal-lexical)) = 0.2.1
-Provides: bundled(crate(mio)) = 0.8.11
-Provides: bundled(crate(nix)) = 0.28.0
-Provides: bundled(crate(nix)) = 0.14.1
-Provides: bundled(crate(nom)) = 7.1.3
-Provides: bundled(crate(normalize-line-endings)) = 0.3.0
-Provides: bundled(crate(num-traits)) = 0.2.15
-Provides: bundled(crate(num_cpus)) = 1.15.0
-Provides: bundled(crate(once_cell)) = 1.19.0
-Provides: bundled(crate(pin-project-lite)) = 0.2.9
-Provides: bundled(crate(pin-utils)) = 0.1.0
-Provides: bundled(crate(pkg-config)) = 0.3.27
-Provides: bundled(crate(ppv-lite86)) = 0.2.17
-Provides: bundled(crate(predicates)) = 3.0.3
-Provides: bundled(crate(predicates-core)) = 1.0.6
-Provides: bundled(crate(predicates-tree)) = 1.0.9
-Provides: bundled(crate(pretty-hex)) = 0.4.1
-Provides: bundled(crate(proc-macro2)) = 1.0.66
-Provides: bundled(crate(proptest)) = 1.2.0
-Provides: bundled(crate(quick-error)) = 1.2.3
-Provides: bundled(crate(quote)) = 1.0.28
-Provides: bundled(crate(rand)) = 0.8.5
-Provides: bundled(crate(rand_chacha)) = 0.3.1
-Provides: bundled(crate(rand_core)) = 0.6.4
-Provides: bundled(crate(rand_xorshift)) = 0.3.0
-Provides: bundled(crate(regex)) = 1.8.4
-Provides: bundled(crate(regex-automata)) = 0.1.10
-Provides: bundled(crate(regex-syntax)) = 0.7.2
-Provides: bundled(crate(regex-syntax)) = 0.6.29
-Provides: bundled(crate(retry)) = 2.0.0
-Provides: bundled(crate(rustc-hash)) = 1.1.0
-Provides: bundled(crate(rustix)) = 0.37.25
-Provides: bundled(crate(rusty-fork)) = 0.3.0
-Provides: bundled(crate(ryu)) = 1.0.13
-Provides: bundled(crate(semver)) = 1.0.17
-Provides: bundled(crate(serde)) = 1.0.188
-Provides: bundled(crate(serde_derive)) = 1.0.188
-Provides: bundled(crate(serde_json)) = 1.0.97
-Provides: bundled(crate(sha2)) = 0.10.7
-Provides: bundled(crate(shlex)) = 1.3.0
-Provides: bundled(crate(signal-hook-registry)) = 1.4.1
-Provides: bundled(crate(slab)) = 0.4.8
-Provides: bundled(crate(socket2)) = 0.4.9
-Provides: bundled(crate(strsim)) = 0.10.0
-Provides: bundled(crate(syn)) = 2.0.29
-Provides: bundled(crate(syn)) = 1.0.109
-Provides: bundled(crate(tempfile)) = 3.6.0
-Provides: bundled(crate(termios)) = 0.3.3
-Provides: bundled(crate(termtree)) = 0.4.1
-Provides: bundled(crate(tokio)) = 1.28.2
-Provides: bundled(crate(tokio-macros)) = 2.1.0
-Provides: bundled(crate(typenum)) = 1.16.0
-Provides: bundled(crate(unarray)) = 0.1.4
-Provides: bundled(crate(unicode-ident)) = 1.0.9
-Provides: bundled(crate(utf8parse)) = 0.2.1
-Provides: bundled(crate(uuid)) = 1.3.4
-Provides: bundled(crate(version_check)) = 0.9.4
-Provides: bundled(crate(void)) = 1.0.2
-Provides: bundled(crate(wait-timeout)) = 0.2.0
-
 %description
 %{summary}.
 
@@ -208,7 +66,7 @@ ExcludeArch:    i686
 
 Requires:     stratisd
 Requires:     dracut >= 051
-Requires:     systemd
+Requires:     plymouth
 
 %description dracut
 %{summary}.
@@ -227,12 +85,38 @@ Requires:     stratisd
 %{summary}.
 
 %prep
-%autosetup -n stratisd-stratisd-v%{version} %{?rhel:-a1}
+# Rename SOURCE0's top-level directory because it starts with
+# stratisd-stratisd-v. GitHub calculates the directory name from the repo name
+# + the tag. Extract the upstream crate on top of the extracted GitHub release,
+# overwriting changed files. The primary purpose of this step is to ensure that
+# the Cargo.toml that is used in building is the one that is generated by
+# cargo-publish and cargo-package, not the file with path dependencies that
+# GitHub packs up. Tar the overwritten files back up again into a tar file
+# with the format and top-level directory that %setup expects cleaning up the
+# previously extracted directory and its contents at the same time. Move the
+# newly created tar file to the SOURCE0 location.
+tar --transform="s/^stratisd\-stratisd-v/stratisd-/" --extract --file %{SOURCE0}
+tar --extract --overwrite --file %{SOURCE2}
+tar --create --gzip --file %{SOURCE0}.newfile ./stratisd-%{version} --remove-files
+mv %{SOURCE0}.newfile %{SOURCE0}
+
+%setup -q
+
+%if 0%{?rhel}
+
+# Untar the vendor tarfile.
+tar --extract --file %{SOURCE1}
+
+# Remove pre-compiled procedural macro, compile from source
+rm ./vendor/serde_derive/serde_derive-x86_64-unknown-linux-gnu
+%patch0 -p1
+
+# Rezip the tarfile
+tar --create --gzip --file %{SOURCE1}.newfile ./vendor --remove-files
+mv %{SOURCE1}.newfile %{SOURCE1}
 
-%if 0%{?rhel} >= 10
-%cargo_prep -v vendor
-%elif 0%{?rhel} && 0%{?rhel} < 10
 %cargo_prep -V 1
+
 %else
 %cargo_prep
 %generate_buildrequires
@@ -240,34 +124,35 @@ Requires:     stratisd
 %endif
 
 %build
-%if 0%{?rhel} && 0%{?rhel} < 10
+%if 0%{?rhel}
 %{__cargo} build %{?_smp_mflags} --release --bin=stratisd
 %{__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=stratisd-tools --no-default-features --features engine,extras,min
+%{__cargo} build %{?_smp_mflags} --release --bin=stratis-dumpmetadata --no-default-features --features engine,extras,min
 %else
+%cargo_license_summary -f engine,dbus_enabled,min,systemd_compat,extras,udev_scripts
 %{cargo_license -f engine,dbus_enabled,min,systemd_compat,extras,udev_scripts} > LICENSE.dependencies
 %{__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=stratisd-tools --no-default-features --features engine,extras,min
+%{__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
-%if 0%{?rhel} >= 10
-%{cargo_vendor_manifest}
-%endif
 
 %install
 %make_install DRACUTDIR=%{dracutdir} PROFILEDIR=release
 
 %if %{with check}
 %check
-%if 0%{?rhel} && 0%{?rhel} < 10
+# Compile stratisd tests only where package does not use vendoring.
-%cargo_test --no-run
+# This is a temporary step, to address the problem of loopdev crate
-%else
+# 0.4.0 failing to build properly in some situations due to a failure of
+# bindgen 0.59.0.
+# See https://github.com/stratis-storage/project/issues/607
+%if !0%{?rhel}
 %cargo_test -- --no-run
 %endif
 %endif
@@ -283,12 +168,10 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 
 %files
 %license LICENSE
-%if !(0%{?rhel} && 0%{?rhel} < 10)
+%if 0%{?rhel}
+%else
 %license LICENSE.dependencies
 %endif
-%if 0%{?rhel} >= 10
-%license cargo-vendor.txt
-%endif
 %doc README.md
 %{_libexecdir}/stratisd
 %dir %{_datadir}/dbus-1
@@ -320,25 +203,10 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 
 %files tools
 %license LICENSE
-%{_bindir}/stratisd-tools
 %{_bindir}/stratis-dumpmetadata
 %{_mandir}/man8/stratis-dumpmetadata.8*
 
 %changelog
-* Wed May 01 2024 Bryan Gurney <bgurney@redhat.com> - 3.6.7-1
-- Update to 3.6.7
-- Resolves: RHEL-34250
-
-* Mon Nov 20 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.2-1
-- Ensure proper alignment of flex devices
-- Resolves: RHEL-16736
-
-* Mon Nov 06 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.1-1
-- Update to version 3.6.1
-- Resolves: RHEL-2278
-- Add filesystem growth limits
-- Resolves: RHEL-12898
-
 * Mon Jul 31 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.8-1
 - Refine handling of partially-set-up pools
 - Resolves: rhbz#2223409
@@ -357,9 +225,6 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 - Support key description key in kernel keyring
 - Resolves: rhbz#2038492
 
-* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 3.4.4-1
-- Rebuilt for MSVSphere 9.2 beta
-
 * Tue Jan 03 2023 Bryan Gurney <bgurney@redhat.com> - 3.4.4-1
 - Use devicemapper-rs version 0.32.3
 - Resolves: rhbz#2155689