diff --git a/.gitignore b/.gitignore index f60666f..3357f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /libgit2-1.0.0.tar.gz /libgit2-1.0.1.tar.gz /libgit2-1.1.0.tar.gz +/libgit2-1.3.0.tar.gz diff --git a/libgit2.spec b/libgit2.spec index 1dbce37..643a58b 100644 --- a/libgit2.spec +++ b/libgit2.spec @@ -6,12 +6,12 @@ %endif Name: libgit2 -Version: 1.1.0 +Version: 1.3.0 Release: %autorelease Summary: C implementation of the Git core methods as a library with a solid API License: GPLv2 with exceptions URL: https://libgit2.org/ -Source0: https://github.com/libgit2/libgit2/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/libgit2/libgit2/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: cmake >= 3.5.1 @@ -25,6 +25,7 @@ BuildRequires: openssl-devel BuildRequires: pcre2-devel BuildRequires: python3 BuildRequires: zlib-devel +BuildRequires: libgit2 Provides: bundled(libxdiff) %description @@ -54,7 +55,7 @@ sed -i '/-sonline/s/^/#/' tests/CMakeLists.txt rm -vr deps %build -%cmake . -B%{_target_platform} \ +%cmake \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DREGEX_BACKEND=pcre2 \ @@ -66,17 +67,20 @@ rm -vr deps -DUSE_SSH=OFF \ %endif %{nil} -%ninja_build -C %{_target_platform} +%cmake_build %install -%ninja_install -C %{_target_platform} +%cmake_install +# Include previous ABI version for temporary binary compatibility +cp -a %{_libdir}/libgit2.so.1.1* %{buildroot}%{_libdir} %check -%ninja_test -C %{_target_platform} +%ctest %files %license COPYING -%{_libdir}/libgit2.so.* +%{_libdir}/libgit2.so.1.3* +%{_libdir}/libgit2.so.1.1* %files devel %doc AUTHORS docs examples README.md diff --git a/sources b/sources index 4534625..2b5d127 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgit2-1.1.0.tar.gz) = 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8 +SHA512 (libgit2-1.3.0.tar.gz) = 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e