From 01f395c0d14378a753e5653143daa16914359efc Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Mon, 14 Mar 2022 12:15:32 -0400
Subject: [PATCH] Use upstream crate for Rust source

---
 .gitignore                 |  1 +
 sources                    |  1 +
 stratisd-fix-metadata.diff | 15 ---------------
 stratisd.spec              |  9 ++++++---
 4 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 stratisd-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index cfaae0c..14448fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /stratisd-3.0.3-vendor.tar.gz
 /stratisd-3.0.4.tar.gz
 /stratisd-3.0.4-vendor.tar.gz
+/stratisd-3.0.4.crate
diff --git a/sources b/sources
index 0ce846a..4d50259 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
+SHA512 (stratisd-3.0.4.crate) = fa6edd7d9051bbd5c3e1aefb0301993f32271804cf5002f293a13e9b18409d65ce878d543d64e02299d97764930ae4fc0143f33026378b26bd4cb347fd056481
 SHA512 (stratisd-3.0.4.tar.gz) = 2da560302f6b7c6cd502fa521259cb5b265bc952556523af5cba1440a9e7bcd2ac61d6e341fff1320eb4e4d5aca84b9f555af62c268360b1014af78e97f15025
 SHA512 (stratisd-3.0.4-vendor.tar.gz) = 4c2adf231e3361c80d0eea93f7d55e35989641fe17b87e9c8f62420e2b2c360d56c656f147573e4a6f238a62fc0fe567320861e22f98fd5df178dd56cedbecf1
diff --git a/stratisd-fix-metadata.diff b/stratisd-fix-metadata.diff
deleted file mode 100644
index f7f20b4..0000000
--- a/stratisd-fix-metadata.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- stratisd/Cargo.toml	2021-12-21 10:54:57.964593614 -0500
-+++ stratisd/Cargo.toml	2021-12-21 10:55:56.364280448 -0500
-@@ -72,12 +72,9 @@
-
- [dependencies.devicemapper]
- version = "0.32.0"
--git = "https://github.com/stratis-storage/devicemapper-rs"
--branch = "crates-io-patch-0.32.0"
-
- [dependencies.stratisd_proc_macros]
- version = "0.1.0"
--path = "./stratisd_proc_macros"
-
- [dependencies.libcryptsetup-rs]
- version = "0.5.0"
diff --git a/stratisd.spec b/stratisd.spec
index e3ade7f..efe13ef 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -10,7 +10,7 @@
 
 Name:           stratisd
 Version:        3.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 # 0BSD or MIT or ASL 2.0
@@ -26,8 +26,7 @@ License:        MPLv2.0 and ASL 2.0 and BSD and MIT
 URL:            https://github.com/stratis-storage/stratisd
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{url}/releases/download/v%{version}/%{name}-%{version}-vendor.tar.gz
-# Fix the metadata so all dependencies are on packaged, upstreamed, packages
-Patch0:         stratisd-fix-metadata.diff
+Source2:	%{crates_source}
 
 ExclusiveArch:  %{rust_arches}
 
@@ -71,6 +70,7 @@ a Linux install.
 
 %prep
 %autosetup -p1
+tar xvf %{SOURCE2}
 %if 0%{?rhel} && !0%{?eln}
 # Source1 is vendored dependencies
 %cargo_prep -V 1
@@ -171,6 +171,9 @@ install -Dpm0755 -t %{buildroot}%{_systemd_util_dir} systemd/stratis-fstab-setup
 %{_systemdgeneratordir}/stratis-setup-generator
 
 %changelog
+* Mon Mar 14 2022 mulhern <amulhern@redhat.com> - 3.0.4-2
+- Use upstream crate for Rust source
+
 * Sat Feb 12 2022 mulhern <amulhern@redhat.com> - 3.0.4-1
 - Update to 3.0.4