diff --git a/.gitignore b/.gitignore index 7092e58..f7a03cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /coreos-installer-0.1.3.crate /coreos-installer-0.2.0.crate /coreos-installer-0.2.1.crate +/coreos-installer-0.3.0.crate diff --git a/cargo-byte-unit.patch b/cargo-byte-unit.patch new file mode 100644 index 0000000..b6d5ecd --- /dev/null +++ b/cargo-byte-unit.patch @@ -0,0 +1,11 @@ +--- coreos-installer-0.3.0/Cargo.toml.old 2020-07-15 14:35:50.232739083 -0400 ++++ coreos-installer-0.3.0/Cargo.toml 2020-07-15 14:36:14.063736809 -0400 +@@ -36,7 +36,7 @@ + version = "^1.3" + + [dependencies.byte-unit] +-version = "^4.0" ++version = ">= 3.1.0, < 5.0.0" + + [dependencies.clap] + version = "^2.33" diff --git a/cargo-relax-osmet-dependencies.patch b/cargo-relax-osmet-dependencies.patch deleted file mode 100644 index daed22f..0000000 --- a/cargo-relax-osmet-dependencies.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur a/Cargo.toml b/Cargo.toml ---- a/Cargo.toml 2020-05-29 20:14:55.000000000 -0400 -+++ b/Cargo.toml 2020-05-29 21:11:45.472999037 -0400 -@@ -55,16 +55,16 @@ - version = "^0.4" - - [dependencies.libc] --version = "0.2.71" -+version = "0.2" - - [dependencies.nix] - version = "^0.17" - - [dependencies.openssl] --version = "^0.10.29" -+version = "^0.10" - - [dependencies.pipe] --version = "^0.3.0" -+version = "^0.3" - - [dependencies.progress-streams] - version = "^1.1" diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index 22eb2fe..7fbb3af 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -5,16 +5,16 @@ %global crate coreos-installer Name: rust-%{crate} -Version: 0.2.1 -Release: 2%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: https://crates.io/crates/coreos-installer Source: %{crates_source} -# https://github.com/coreos/coreos-installer/pull/256 -Patch0: cargo-relax-osmet-dependencies.patch +# https://github.com/coreos/coreos-installer/pull/299 +Patch0: cargo-byte-unit.patch ExclusiveArch: %{rust_arches} @@ -67,10 +67,13 @@ Obsoletes: coreos-installer-dracut < 0.0.1 %install %cargo_install # Install binaries, units, targets, generators for running via systemd -install -D -m 0755 -t %{buildroot}%{_libexecdir} systemd/coreos-installer-service +install -D -m 0755 -t %{buildroot}%{_libexecdir} scripts/coreos-installer-service +install -D -m 0755 -t %{buildroot}%{_libexecdir} scripts/coreos-installer-disable-device-auto-activation +install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-disable-device-auto-activation.service install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer.service install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-reboot.service install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-noreboot.service +install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-pre.target install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer.target install -D -m 0755 -t %{buildroot}%{_systemdgeneratordir} systemd/coreos-installer-generator @@ -92,6 +95,9 @@ Requires: %{crate}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %endif %changelog +* Mon Jul 13 2020 Benjamin Gilbert - 0.3.0-1 +- New release + * Sat May 30 2020 Igor Raits - 0.2.1-2 - Fixup license diff --git a/sources b/sources index 07ceff0..66faf55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (coreos-installer-0.2.1.crate) = 5f881df424de4f7a78968fe74f1789eb61155cc0dcd4c38250226ef42b0667842c46ae029c00d36dc066d7abf70ab60d6f20ea6461caa8d3aed8df8f666aa467 +SHA512 (coreos-installer-0.3.0.crate) = 0922b99f82461d7bfe1ec4723c5f89343c2918a59c7f2872fc37dfbf7176c75eb465fa260418e5d34d773304120f9a2166e603803bd2d7f20e05328b6dfa7ca3