From 0116cae7972fa3fccd12409c239ca7f0691708b5 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 9 Feb 2024 01:35:00 +0300 Subject: [PATCH] import libgit2-1.7.2-2.el9 --- .gitignore | 2 +- .libgit2.metadata | 2 +- SPECS/libgit2.spec | 49 +++++++++++++++++++++++++++++++++++++++------- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6d6420e..2ea97c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libgit2-1.6.4.tar.gz +SOURCES/libgit2-1.7.2.tar.gz diff --git a/.libgit2.metadata b/.libgit2.metadata index 203ffcd..d8f625d 100644 --- a/.libgit2.metadata +++ b/.libgit2.metadata @@ -1 +1 @@ -4cb2b492d8fd7d9052d9181509c33b9b7e138900 SOURCES/libgit2-1.6.4.tar.gz +73bd1be50095831b2ce2a35c14ce6e25063d51f2 SOURCES/libgit2-1.7.2.tar.gz diff --git a/SPECS/libgit2.spec b/SPECS/libgit2.spec index f49007b..fedc6c4 100644 --- a/SPECS/libgit2.spec +++ b/SPECS/libgit2.spec @@ -1,8 +1,8 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.3.5) +## (rpmautospec version 0.6.0) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 1; + release_number = 2; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -16,7 +16,7 @@ %endif Name: libgit2 -Version: 1.6.4 +Version: 1.7.2 Release: %autorelease Summary: C implementation of the Git core methods as a library with a solid API License: GPLv2 with exceptions @@ -27,6 +27,7 @@ BuildRequires: gcc BuildRequires: cmake >= 3.5.1 BuildRequires: ninja-build BuildRequires: http-parser-devel +BuildRequires: krb5-devel BuildRequires: libcurl-devel %if %{with libssh2} BuildRequires: libssh2-devel @@ -68,8 +69,19 @@ find examples -name ".gitignore" -delete -print # Don't run "online" tests sed -i '/-sonline/s/^/#/' tests/libgit2/CMakeLists.txt -# Remove bundled libraries -rm -vr deps +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 +# On Fedora 40+ and RHEL 10+, we're using zlib-ng rather than +# zlib for compression. As a result, all of the pack tests fail +# due to checking the hashes of the packed data against static +# values that were created with zlib. +# https://github.com/libgit2/libgit2/issues/6728 +sed -i 's/-xonline/-xonline -xpack/' tests/libgit2/CMakeLists.txt +%endif + +# Remove bundled libraries (except libxdiff) +pushd deps +find . -maxdepth 1 -not -name xdiff -exec rm -rf {} ';' +popd %build %cmake \ @@ -97,7 +109,7 @@ rm -vr deps %files %license COPYING -%{_libdir}/libgit2.so.1.6* +%{_libdir}/libgit2.so.1.7* %files devel %doc AUTHORS docs examples README.md @@ -107,9 +119,31 @@ rm -vr deps %{_includedir}/git2/ %changelog -* Wed Jan 10 2024 MSVSphere Packaging Team - 1.6.4-1 +## START: Generated by rpmautospec +* Wed Feb 07 2024 Stephen Gallagher - 1.7.2-1 +- Update to 1.7.2 + +* Wed Feb 07 2024 Stephen Gallagher - 1.7.1-5 +- Skip 'pack' tests on F40+ + +* Thu Jan 25 2024 Fedora Release Engineering - 1.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 10 2024 MSVSphere Packaging Team - 1.7.1-2 - Rebuilt for MSVSphere 9.3 +* Thu Aug 17 2023 Yaakov Selkowitz - 1.7.1-2 +- Use krb5 GSSAPI + +* Mon Aug 14 2023 Pete Walter - 1.7.1-1 +- Update to 1.7.1 + +* Thu Jul 20 2023 Fedora Release Engineering - 1.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Apr 13 2023 Pete Walter - 1.6.4-1 - Update to 1.6.4 @@ -403,3 +437,4 @@ rm -vr deps * Thu Oct 18 2012 Veeti Paananen - 0.17.0-1 - Initial package. +## END: Generated by rpmautospec