diff --git a/.gitignore b/.gitignore index 90a0e51..6b898ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /phf-0.7.21.crate /phf-0.7.22.crate /phf-0.7.23.crate +/phf-0.7.24.crate diff --git a/phf-0.7.22-fix-metadata.diff b/phf-0.7.22-fix-metadata.diff deleted file mode 100644 index 2d01fd9..0000000 --- a/phf-0.7.22-fix-metadata.diff +++ /dev/null @@ -1,7 +0,0 @@ ---- phf-0.7.22/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ phf-0.7.22/Cargo.toml 2018-05-02T14:24:36.895713-07:00 -@@ -28,4 +28,3 @@ - - [features] - core = ["phf_shared/core"] --unicase = ["phf_shared/unicase"] diff --git a/phf-fix-metadata.diff b/phf-fix-metadata.diff new file mode 100644 index 0000000..f805af7 --- /dev/null +++ b/phf-fix-metadata.diff @@ -0,0 +1,17 @@ +--- phf-0.7.24/Cargo.toml 1969-12-31T16:00:00-08:00 ++++ phf-0.7.24/Cargo.toml 2019-01-07T22:33:59.562483-08:00 +@@ -22,14 +22,9 @@ + name = "phf" + path = "src/lib.rs" + test = false +-[dependencies.phf_macros] +-version = "0.7.24" +-optional = true + + [dependencies.phf_shared] + version = "0.7.24" + + [features] + core = ["phf_shared/core"] +-macros = ["phf_macros"] +-unicase = ["phf_shared/unicase"] diff --git a/rust-phf.spec b/rust-phf.spec index 91a33e5..b0c8af6 100644 --- a/rust-phf.spec +++ b/rust-phf.spec @@ -1,12 +1,13 @@ # Generated by rust2rpm -%bcond_without check +# The tests use the nightly macros feature +%bcond_with check %global debug_package %{nil} %global crate phf Name: rust-%{crate} -Version: 0.7.23 -Release: 2%{?dist} +Version: 0.7.24 +Release: 1%{?dist} Summary: Runtime support for perfect hash function data structures # https://github.com/sfackler/rust-phf/pull/118 @@ -14,14 +15,15 @@ License: MIT URL: https://crates.io/crates/phf Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate # Initial patched metadata +# * Remove macros feature, as phf_macros is nightly only # * Remove unicase feature, https://github.com/sfackler/rust-phf/pull/117 -Patch0: phf-0.7.22-fix-metadata.diff +Patch0: phf-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -BuildRequires: crate(phf_shared/core) = 0.7.23 -BuildRequires: crate(phf_shared/default) = 0.7.23 +BuildRequires: (crate(phf_shared/core) >= 0.7.24 with crate(phf_shared/core) < 0.8.0) +BuildRequires: (crate(phf_shared/default) >= 0.7.24 with crate(phf_shared/default) < 0.8.0) %global _description \ Runtime support for perfect hash function data structures. @@ -80,6 +82,9 @@ which use "core" feature of "%{crate}" crate. %endif %changelog +* Tue Jan 08 2019 Josh Stone - 0.7.24-1 +- Update to 0.7.24 + * Fri Nov 09 2018 Josh Stone - 0.7.23-2 - Adapt to new packaging diff --git a/sources b/sources index 43879de..79f067a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phf-0.7.23.crate) = 8bc773f2c8993a1b2aa3d555fa56cda736b6574b602a3eac5a48faf3d937ba99a140d9d8d98b998caba432d8346364194849947a84df52bb86eb1bead31da8d4 +SHA512 (phf-0.7.24.crate) = 0140e9acb7dbf6ac2d17110e8efc9ef515e2f54b1b3b213d98507da6b9e9e3eb0995173c69b31c34f536ca9b06eab108015ac26d2207af79bec4e20d19d62e44