diff --git a/nix-0.11.0-fix-metadata.diff b/nix-0.11.0-fix-metadata.diff deleted file mode 100644 index b1b2098..0000000 --- a/nix-0.11.0-fix-metadata.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- nix-0.11.0/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ nix-0.11.0/Cargo.toml 2018-07-17T09:47:44.316000+02:00 -@@ -60,12 +60,5 @@ - [dev-dependencies.rand] - version = "0.4" - --[dev-dependencies.tempdir] --version = "0.3" -- - [dev-dependencies.tempfile] --version = "2" --[target."cfg(target_os = \"dragonfly\")".build-dependencies.cc] --version = "1" --[target."cfg(target_os = \"freebsd\")".dev-dependencies.sysctl] --version = "0.1" -+version = "3" diff --git a/nix-fix-metadata.diff b/nix-fix-metadata.diff new file mode 100644 index 0000000..ce2eb24 --- /dev/null +++ b/nix-fix-metadata.diff @@ -0,0 +1,25 @@ +--- nix-0.11.0/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ nix-0.11.0/Cargo.toml 2018-11-02T19:58:10.895037+01:00 +@@ -14,7 +14,7 @@ + name = "nix" + version = "0.11.0" + authors = ["The nix-rust Project Developers"] +-exclude = [".gitignore", ".travis.yml"] ++exclude = ["/.gitignore", "/.travis.yml", "/ci/*", "/Cross.toml", "/RELEASE_PROCEDURE.md", "/bors.toml"] + description = "Rust friendly bindings to *nix APIs" + categories = ["os::unix-apis"] + license = "MIT" +@@ -60,12 +60,5 @@ + [dev-dependencies.rand] + version = "0.4" + +-[dev-dependencies.tempdir] +-version = "0.3" +- + [dev-dependencies.tempfile] +-version = "2" +-[target."cfg(target_os = \"dragonfly\")".build-dependencies.cc] +-version = "1" +-[target."cfg(target_os = \"freebsd\")".dev-dependencies.sysctl] +-version = "0.1" ++version = "3" diff --git a/rust-nix.spec b/rust-nix.spec index 577a488..8b3b4ce 100644 --- a/rust-nix.spec +++ b/rust-nix.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 0.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Rust friendly bindings to *nix APIs License: MIT @@ -15,7 +15,8 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ # Initial patched metadata # * No dragonfly/freebsd # * Bump tempfile to 3, https://github.com/nix-rust/nix/pull/900 -Patch0: nix-0.11.0-fix-metadata.diff +# * Exclude CI files, https://github.com/nix-rust/nix/pull/962 +Patch0: nix-fix-metadata.diff # Make it work with new tempdir Patch0001: 0001-deps-update-tempfile-to-3.patch @@ -51,7 +52,6 @@ which use "%{crate}" crate. %license LICENSE %doc CHANGELOG.md CONTRIBUTING.md CONVENTIONS.md README.md %{cargo_registry}/%{crate}-%{version}/ -%exclude %{cargo_registry}/%{crate}-%{version}/{Cross.toml,RELEASE_PROCEDURE.md,bors.toml,ci} %package -n %{name}+default-devel Summary: %{summary} @@ -82,6 +82,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Fri Nov 02 2018 Igor Gnatenko - 0.11.0-4 +- Exclude CI files in a different way + * Mon Oct 29 2018 Josh Stone - 0.11.0-3 - Adapt to new packaging