From 279d365569d3343e74d7e3e5ca828aa4245fada6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 10 Aug 2018 07:22:52 +0200 Subject: [PATCH] Update to 0.27.4 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + libgit2.spec | 33 +++++++++++++++++---------------- sources | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 3c22928..9fe2cce 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /libgit2-0.26.4.tar.gz /libgit2-0.26.5.tar.gz /libgit2-0.26.6.tar.gz +/libgit2-0.27.4.tar.gz diff --git a/libgit2.spec b/libgit2.spec index 951d4e9..3e51164 100644 --- a/libgit2.spec +++ b/libgit2.spec @@ -1,5 +1,5 @@ Name: libgit2 -Version: 0.26.6 +Version: 0.27.4 Release: 1%{?dist} Summary: C implementation of the Git core methods as a library with a solid API License: GPLv2 with exceptions @@ -7,12 +7,13 @@ URL: http://libgit2.github.com/ Source0: https://github.com/libgit2/libgit2/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc -BuildRequires: cmake +BuildRequires: cmake >= 2.8.11 +BuildRequires: ninja-build BuildRequires: http-parser-devel BuildRequires: libcurl-devel BuildRequires: libssh2-devel BuildRequires: openssl-devel -BuildRequires: python2 +BuildRequires: python3 BuildRequires: zlib-devel Provides: bundled(libxdiff) @@ -36,29 +37,26 @@ developing applications that use %{name}. # Remove VCS files from examples find examples -name ".gitignore" -delete -print -# Fix pkgconfig generation -sed -i 's|@CMAKE_INSTALL_PREFIX@/||' libgit2.pc.in - # Don't test network -sed -i 's/ionline/xonline/' CMakeLists.txt +sed -i 's/ionline/xonline/' tests/CMakeLists.txt # Remove bundled libraries rm -frv deps %build -mkdir %{_target_platform} -pushd %{_target_platform} - %cmake -DTHREADSAFE=ON .. -popd -%make_build -C %{_target_platform} +%cmake . -B%{_target_platform} \ + -GNinja \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DSHA1_BACKEND=OpenSSL \ + -DUSE_HTTPS=OpenSSL \ + %{nil} +%ninja_build -C %{_target_platform} %install -%make_install -C %{_target_platform} +%ninja_install -C %{_target_platform} %check -pushd %{_target_platform} - ctest -VV -popd +%ninja_test -C %{_target_platform} %ldconfig_scriptlets @@ -74,6 +72,9 @@ popd %{_includedir}/git2/ %changelog +* Fri Aug 10 2018 Igor Gnatenko - 0.27.4-1 +- Update to 0.27.4 + * Tue Aug 07 2018 Pete Walter - 0.26.6-1 - Update to 0.26.6 diff --git a/sources b/sources index fc842cd..2d255d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgit2-0.26.6.tar.gz) = 6a5a167bfe8696294cf188feec2aad898af52f4c05a3a40a55f48ea3168d200a60fc42b3819a22b1bf472be696f5dafef473d457c08bab164cbf654c4de6bda7 +SHA512 (libgit2-0.27.4.tar.gz) = d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61