diff --git a/.gitignore b/.gitignore index 676b7ff..fb4972f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /libgit2-sys-0.6.19.crate /libgit2-sys-0.7.1.crate /libgit2-sys-0.7.2.crate +/libgit2-sys-0.7.7.crate diff --git a/rust-libgit2-sys-no-include_depth.patch b/rust-libgit2-sys-no-include_depth.patch new file mode 100644 index 0000000..2f3a136 --- /dev/null +++ b/rust-libgit2-sys-no-include_depth.patch @@ -0,0 +1,13 @@ +diff --git a/libgit2-sys/lib.rs b/libgit2-sys/lib.rs +index 5d0e2972f57d..1e3aca85efcd 100644 +--- a/libgit2-sys/lib.rs ++++ b/libgit2-sys/lib.rs +@@ -770,7 +770,7 @@ pub struct git_index_time { + pub struct git_config_entry { + pub name: *const c_char, + pub value: *const c_char, +- pub include_depth: c_uint, ++ // pub include_depth: c_uint, + pub level: git_config_level_t, + pub free: extern fn(*mut git_config_entry), + pub payload: *mut c_void, diff --git a/rust-libgit2-sys.spec b/rust-libgit2-sys.spec index a97898c..5ed266b 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.2 -Release: 2%{?dist} +Version: 0.7.7 +Release: 1%{?dist} Summary: Native bindings to the libgit2 library License: MIT or ASL 2.0 @@ -15,27 +15,32 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ # Doesn't seem to be upstreamable Patch0: 0001-build.rs-always-use-pkg-config.patch +# The bundled libgit2 is a snapshot from master, after 0.27 branched, and +# adds the field "include_depth" to "struct git_config_entry". We need to +# remove that to match our system libgit2-0.27 instead +Patch1: rust-libgit2-sys-no-include_depth.patch + ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging # [dependencies] -BuildRequires: (crate(curl-sys) >= 0.4.0 with crate(curl-sys) < 0.5.0) +BuildRequires: (crate(curl-sys) >= 0.4.6 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.4 with crate(libssh2-sys) < 0.3.0) -BuildRequires: crate(libz-sys) >= 0.1.2 +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(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.2 with crate(cmake) < 0.2.0) +BuildRequires: (crate(cmake) >= 0.1.24 with crate(cmake) < 0.2.0) BuildRequires: (crate(pkg-config) >= 0.3.0 with crate(pkg-config) < 0.4.0) -BuildRequires: pkgconfig(libgit2) +BuildRequires: (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28) %description %{summary}. %package devel Summary: %{summary} -Requires: pkgconfig(libgit2) +BuildRequires: (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28) BuildArch: noarch %description devel @@ -67,6 +72,9 @@ rm -vrf libgit2 %{cargo_registry}/%{crate}-%{version}/ %changelog +* Fri Aug 10 2018 Josh Stone - 0.7.7-1 +- Update to 0.7.7 + * Sat Jul 14 2018 Fedora Release Engineering - 0.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index e07fa89..5bdadcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgit2-sys-0.7.2.crate) = c10c4d348026baeea08f3f5a2b9bab432934beee489b4390f4613ac3f03667ab2a0d300ac0cfee58295c7d615175a451a3f264cdfed7159228bee6e905e6f485 +SHA512 (libgit2-sys-0.7.7.crate) = 05a3755fdc2c3afe85bbc3cd7379311f8eeb628fe0b6df4cfc01a5b09dbdd665a04c99136b8bee825a1079e2750e612c6eb46b14e9c6fbac4230b41bd06b2da7