diff --git a/git2-fix-metadata.diff b/git2-fix-metadata.diff deleted file mode 100644 index a88d979..0000000 --- a/git2-fix-metadata.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- git2-0.8.0/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ git2-0.8.0/Cargo.toml 2019-02-10T10:25:20.287684+01:00 -@@ -61,7 +61,6 @@ - ssh = ["libgit2-sys/ssh"] - ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"] - unstable = [] --vendored-openssl = ["openssl-sys/vendored"] - [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe] - version = "0.1" - optional = true diff --git a/rust-git2.spec b/rust-git2.spec index bf57048..18ae064 100644 --- a/rust-git2.spec +++ b/rust-git2.spec @@ -1,49 +1,30 @@ -# Generated by rust2rpm-9-1.fc30 -# * Tests are run in infrastructure -%bcond_with check +# Generated by rust2rpm 10 +%bcond_without check %global debug_package %{nil} %global crate git2 Name: rust-%{crate} Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bindings to libgit2 for interoperating with git repositories # Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/git2 Source: %{crates_source} -# Initial patched metadata -# * No vendored openssl -Patch0: git2-fix-metadata.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(bitflags/default) >= 1.0.0 with crate(bitflags/default) < 2.0.0) -BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0) -BuildRequires: (crate(libgit2-sys/default) >= 0.8.0 with crate(libgit2-sys/default) < 0.9.0) -BuildRequires: (crate(libgit2-sys/https) >= 0.8.0 with crate(libgit2-sys/https) < 0.9.0) -BuildRequires: (crate(libgit2-sys/ssh) >= 0.8.0 with crate(libgit2-sys/ssh) < 0.9.0) -BuildRequires: (crate(libgit2-sys/ssh_key_from_memory) >= 0.8.0 with crate(libgit2-sys/ssh_key_from_memory) < 0.9.0) -BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0) -BuildRequires: (crate(openssl-probe/default) >= 0.1.0 with crate(openssl-probe/default) < 0.2.0) -BuildRequires: (crate(openssl-sys/default) >= 0.9.0 with crate(openssl-sys/default) < 0.10.0) -BuildRequires: (crate(url/default) >= 1.0.0 with crate(url/default) < 2.0.0) -%if %{with check} -BuildRequires: (crate(docopt/default) >= 1.0.0 with crate(docopt/default) < 2.0.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) -BuildRequires: (crate(tempdir/default) >= 0.3.7 with crate(tempdir/default) < 0.4.0) -BuildRequires: (crate(thread-id/default) >= 3.3.0 with crate(thread-id/default) < 4.0.0) -BuildRequires: (crate(time/default) >= 0.1.39 with crate(time/default) < 0.2.0) -%endif -%global _description \ -Bindings to libgit2 for interoperating with git repositories. This library is\ -both threadsafe and memory safe and allows both reading and writing git\ -repositories. +%global _description %{expand: +Bindings to libgit2 for interoperating with git repositories. This library is +both threadsafe and memory safe and allows both reading and writing git +repositories.} %description %{_description} @@ -149,6 +130,9 @@ which use "unstable" feature of "%{crate}" crate. %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires + %build %cargo_build @@ -161,6 +145,9 @@ which use "unstable" feature of "%{crate}" crate. %endif %changelog +* Thu Jun 20 00:20:24 CEST 2019 Igor Gnatenko - 0.9.1-2 +- Regenerate + * Fri Jun 07 2019 Josh Stone - 0.9.1-1 - Update to 0.9.1