From 2db44ad5c0706a81b60ab469c9b1338c9fb152d9 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 17 Sep 2018 15:29:58 -0700 Subject: [PATCH] Update to 0.7.8 --- .gitignore | 1 + 0001-build.rs-always-use-pkg-config.patch | 12 ++++++------ rust-libgit2-sys.spec | 16 +++++++++------- sources | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index fb4972f..2ccacd8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libgit2-sys-0.7.1.crate /libgit2-sys-0.7.2.crate /libgit2-sys-0.7.7.crate +/libgit2-sys-0.7.8.crate diff --git a/0001-build.rs-always-use-pkg-config.patch b/0001-build.rs-always-use-pkg-config.patch index 3715956..b8f2bdb 100644 --- a/0001-build.rs-always-use-pkg-config.patch +++ b/0001-build.rs-always-use-pkg-config.patch @@ -9,13 +9,13 @@ Signed-off-by: Igor Gnatenko 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs -index c7545c2..b7aefcf 100644 +index 619472db287d..bc12a5976d4c 100644 --- a/libgit2-sys/build.rs +++ b/libgit2-sys/build.rs -@@ -31,10 +31,8 @@ fn main() { - } - let has_pkgconfig = Command::new("pkg-config").output().is_ok(); - +@@ -11,10 +11,8 @@ fn main() { + let ssh = env::var("CARGO_FEATURE_SSH").is_ok(); + let curl = env::var("CARGO_FEATURE_CURL").is_ok(); + - if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() { - if pkg_config::find_library("libgit2").is_ok() { - return @@ -26,5 +26,5 @@ index c7545c2..b7aefcf 100644 if !Path::new("libgit2/.git").exists() { -- -2.15.0 +2.17.1 diff --git a/rust-libgit2-sys.spec b/rust-libgit2-sys.spec index 157d465..5c6a18a 100644 --- a/rust-libgit2-sys.spec +++ b/rust-libgit2-sys.spec @@ -5,8 +5,8 @@ %global crate libgit2-sys Name: rust-%{crate} -Version: 0.7.7 -Release: 2%{?dist} +Version: 0.7.8 +Release: 1%{?dist} Summary: Native bindings to the libgit2 library License: MIT or ASL 2.0 @@ -24,14 +24,13 @@ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging # [dependencies] -BuildRequires: (crate(curl-sys) >= 0.4.6 with crate(curl-sys) < 0.5.0) +BuildRequires: (crate(curl-sys) >= 0.4.10 with crate(curl-sys) < 0.5.0) BuildRequires: (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0) -BuildRequires: (crate(libssh2-sys) >= 0.2.8 with crate(libssh2-sys) < 0.3.0) -BuildRequires: (crate(libz-sys) >= 1.0.18 with crate(libz-sys) < 2.0.0) +BuildRequires: (crate(libssh2-sys) >= 0.2.11 with crate(libssh2-sys) < 0.3.0) +BuildRequires: (crate(libz-sys) >= 1.0.22 with crate(libz-sys) < 2.0.0) BuildRequires: (crate(openssl-sys) >= 0.9.0 with crate(openssl-sys) < 0.10.0) # [build-dependencies] -BuildRequires: (crate(cc) >= 1.0.0 with crate(cc) < 2.0.0) -BuildRequires: (crate(cmake) >= 0.1.24 with crate(cmake) < 0.2.0) +BuildRequires: (crate(cc) >= 1.0.25 with crate(cc) < 2.0.0) BuildRequires: (crate(pkg-config) >= 0.3.0 with crate(pkg-config) < 0.4.0) BuildRequires: (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28) @@ -72,6 +71,9 @@ rm -vrf libgit2 %{cargo_registry}/%{crate}-%{version}/ %changelog +* Mon Sep 17 2018 Josh Stone - 0.7.8-1 +- Update to 0.7.8 + * Fri Aug 10 2018 Josh Stone - 0.7.7-2 - Fix the devel Requires diff --git a/sources b/sources index 5bdadcc..19d3a2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgit2-sys-0.7.7.crate) = 05a3755fdc2c3afe85bbc3cd7379311f8eeb628fe0b6df4cfc01a5b09dbdd665a04c99136b8bee825a1079e2750e612c6eb46b14e9c6fbac4230b41bd06b2da7 +SHA512 (libgit2-sys-0.7.8.crate) = 21953739a729ba04352c4da3804139fdc717b2230618f8b6976824f8ce52c5578f03e6c7e319c3fd08fa2b935a71f7e5899777aba7c872e3f6a819228c07219a