From 2c0fb32044df3e2529e96bd65594ba13890caa5c Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 4 Jun 2019 16:48:51 -0700 Subject: [PATCH] Bump nix to 0.14 --- stratisd-fix-metadata.diff | 11 +++++++++++ stratisd.spec | 10 ++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 stratisd-fix-metadata.diff diff --git a/stratisd-fix-metadata.diff b/stratisd-fix-metadata.diff new file mode 100644 index 0000000..b44f441 --- /dev/null +++ b/stratisd-fix-metadata.diff @@ -0,0 +1,11 @@ +--- stratisd/Cargo.toml 2019-06-04T23:39:07.962690+00:00 ++++ stratisd/Cargo.toml 2019-06-04T23:39:07.962690+00:00 +@@ -7,7 +7,7 @@ + [dependencies] + dbus = {version = "0.6.4", optional = true} + clap = "2" +-nix = "0.13" ++nix = "0.14" + devicemapper = "0.27.0" + crc = "1" + byteorder = "1" diff --git a/stratisd.spec b/stratisd.spec index 7e4a2d9..70dd546 100644 --- a/stratisd.spec +++ b/stratisd.spec @@ -8,12 +8,15 @@ Name: stratisd Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Daemon that manages block devices to create filesystems License: MPLv2.0 URL: https://github.com/stratis-storage/stratisd Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# Initial patched metadata +# * Bump nix to 0.14, https://github.com/stratis-storage/stratisd/pull/1552 +Patch0: stratisd-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -30,7 +33,7 @@ BuildRequires: (crate(libc/default) >= 0.2.47 with crate(libc/default) < 0.3.0) BuildRequires: (crate(libmount/default) >= 0.1.10 with crate(libmount/default) < 0.2.0) BuildRequires: (crate(libudev/default) >= 0.2.0 with crate(libudev/default) < 0.3.0) BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0) -BuildRequires: (crate(nix/default) >= 0.13.0 with crate(nix/default) < 0.14.0) +BuildRequires: (crate(nix/default) >= 0.14.0 with crate(nix/default) < 0.15.0) BuildRequires: (crate(rand/default) >= 0.4.0 with crate(rand/default) < 0.5.0) BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0) BuildRequires: (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0) @@ -106,6 +109,9 @@ mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_sbindir}/stratisd-init %{_unitdir}/stratisd.service %changelog +* Tue Jun 04 2019 Josh Stone - 1.0.4-2 +- Bump nix to 0.14 + * Tue May 07 08:16:24 CEST 2019 Igor Gnatenko - 1.0.4-1 - Update to 1.0.4