From c4725d0d3e67e74609cfd2497658ebcebdec1df5 Mon Sep 17 00:00:00 2001 From: ebasov Date: Tue, 14 Jan 2025 11:15:40 +0300 Subject: [PATCH] Rebuild For MSVSphere 10 --- .gitignore | 2 +- .libgit2.metadata | 2 +- SPECS/libgit2.spec | 61 ++++++++++++++++++++++++++++++---------------- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 2ea97c0..9b5c4dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libgit2-1.7.2.tar.gz +SOURCES/libgit2-1.8.4.tar.gz diff --git a/.libgit2.metadata b/.libgit2.metadata index d8f625d..1b48b5d 100644 --- a/.libgit2.metadata +++ b/.libgit2.metadata @@ -1 +1 @@ -73bd1be50095831b2ce2a35c14ce6e25063d51f2 SOURCES/libgit2-1.7.2.tar.gz +f665cca83411efaf9d074455b65101b499e896c4 SOURCES/libgit2-1.8.4.tar.gz diff --git a/SPECS/libgit2.spec b/SPECS/libgit2.spec index fedc6c4..7f5ef15 100644 --- a/SPECS/libgit2.spec +++ b/SPECS/libgit2.spec @@ -1,8 +1,8 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.6.0) +## (rpmautospec version 0.7.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -16,17 +16,18 @@ %endif Name: libgit2 -Version: 1.7.2 +Version: 1.8.4 Release: %autorelease Summary: C implementation of the Git core methods as a library with a solid API -License: GPLv2 with exceptions +# Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. +License: LicenseRef-Callaway-GPLv2-with-exceptions URL: https://libgit2.org/ -Source0: https://github.com/libgit2/libgit2/archive/refs/tags/v%{version}.tar.gz#/libgit2-%{version}.tar.gz +Source0: https://github.com/libgit2/libgit2/archive/refs/tags/v%{version_no_tilde}.tar.gz#/libgit2-%{version_no_tilde}.tar.gz BuildRequires: gcc BuildRequires: cmake >= 3.5.1 BuildRequires: ninja-build -BuildRequires: http-parser-devel +BuildRequires: llhttp-devel BuildRequires: krb5-devel BuildRequires: libcurl-devel %if %{with libssh2} @@ -61,7 +62,7 @@ This package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -p1 -n libgit2-%{version} +%autosetup -p1 -n libgit2-%{version_no_tilde} # Remove VCS files from examples find examples -name ".gitignore" -delete -print @@ -69,15 +70,6 @@ find examples -name ".gitignore" -delete -print # Don't run "online" tests sed -i '/-sonline/s/^/#/' tests/libgit2/CMakeLists.txt -%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 {} ';' @@ -89,7 +81,7 @@ popd -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DREGEX_BACKEND=pcre2 \ -DBUILD_CLI=OFF \ - -DUSE_HTTP_PARSER=system \ + -DUSE_HTTP_PARSER=llhttp \ -DUSE_SHA1=HTTPS \ -DUSE_HTTPS=OpenSSL \ -DUSE_NTLMCLIENT=OFF \ @@ -109,7 +101,7 @@ popd %files %license COPYING -%{_libdir}/libgit2.so.1.7* +%{_libdir}/libgit2.so.1.8* %files devel %doc AUTHORS docs examples README.md @@ -120,6 +112,36 @@ popd %changelog ## START: Generated by rpmautospec +* Tue Jan 14 2025 Eduard Basov - 1.8.4-1 +- Rebuild For MSVSphere 10 + +* Wed Oct 30 2024 Pete Walter - 1.8.4-1 +- Update to 1.8.4 + +* Wed Oct 30 2024 Pete Walter - 1.8.3-2 +- Re-apply commit const declaration revert + +* Sat Oct 26 2024 Pete Walter - 1.8.3-1 +- Update to 1.8.3 + +* Sat Oct 19 2024 Pete Walter - 1.8.2-1 +- Update to 1.8.2 + +* Tue Oct 01 2024 Pete Walter - 1.8.2~rc1-1 +- Update to 1.8.2-rc1 (rhbz#2310821) + +* Wed Sep 04 2024 Pete Walter - 1.8.1-1 +- Update to 1.8.1 (rhbz#2270542) + +* Mon Sep 02 2024 Miroslav Suchý - 1.7.2-5 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 1.7.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed May 01 2024 Stephen Gallagher - 1.7.2-3 +- Replace http-parser with llhttp + * Wed Feb 07 2024 Stephen Gallagher - 1.7.2-1 - Update to 1.7.2 @@ -132,9 +154,6 @@ popd * 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