diff --git a/.gitignore b/.gitignore index 7944e09..a743e27 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,6 @@ /stratisd-3.5.8.crate /stratisd-3.5.8.tar.gz /stratisd-3.5.8-vendor.tar.gz +/stratisd-3.5.9.tar.gz +/stratisd-3.5.9-vendor.tar.gz +/stratisd-3.5.9.crate diff --git a/sources b/sources index 09f2886..59b55f0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (stratisd-3.5.8.crate) = 12e54377861a212f3bc745c0596e6f3381ef1b34f70392d9acc8c040c8d22ec0eeb1933df80dc344962e9fabcb2e3c56ab7e318dfe679254665629fc739f0cc4 -SHA512 (stratisd-3.5.8.tar.gz) = c5cf64f2261b7315149abe1d49d997adfce586295998be364f01f4046e400edb404db49f6b60d3acadb377b8df085a3b565365e910aca7c04c2e12943a72846b -SHA512 (stratisd-3.5.8-vendor.tar.gz) = 90d953d88dd03a84739e9ea2b776a34aa1ae451c08db76186c799e50b85345c16daaa66c323260ce99665f8023c99d1f56c1d35ee65e98dcbe393d4a5457c466 +SHA512 (stratisd-3.5.9.tar.gz) = a9ce8330e17f5af01200a0fc0814f0d306c0d224588f52632066f0fb7d97bd438dfff25519428a74348d68d827091e6e9623ddb4d2d5f4f0ac51d0bd1b5eb5d2 +SHA512 (stratisd-3.5.9-vendor.tar.gz) = 4341f3fc18071f271da114c2bf46f827d29372591cc0119d86196ebc1e910b0ea42d971bddc6a7718ed1e39cf076af339f2ae0e5fa40ddafd519605be4949827 +SHA512 (stratisd-3.5.9.crate) = f811107747b5e12f720a2e0224145f9d145696eb76c340199ed97de3ae39f2d796a12fb5a22f5405234af16143e1348b2f88f1405b6444c4603335d384685350 diff --git a/stratisd.spec b/stratisd.spec index 7748d60..c69d3eb 100644 --- a/stratisd.spec +++ b/stratisd.spec @@ -4,8 +4,8 @@ %global dracutdir %(pkg-config --variable=dracutdir dracut) Name: stratisd -Version: 3.5.8 -Release: 4%{?dist} +Version: 3.5.9 +Release: 1%{?dist} Summary: Daemon that manages block devices to create filesystems License: (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND MPL-2.0 AND (Unlicense OR MIT) @@ -14,7 +14,6 @@ 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} @@ -103,20 +102,7 @@ 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} - %cargo_prep -V 1 - %else %cargo_prep %generate_buildrequires @@ -207,6 +193,10 @@ a2x -f manpage docs/stratis-dumpmetadata.txt %{_mandir}/man8/stratis-dumpmetadata.8* %changelog +* Wed Aug 30 2023 Bryan Gurney - 3.5.9-1 +- Update to 3.5.9 +- Remove patch macro for serde_derive patch + * Mon Jul 31 2023 Bryan Gurney - 3.5.8-4 - Use patch macro for serde_derive patch