commit 4b968fb1d51f88f6636aabf159cfa0aba0f2df7e Author: Jan Palus <at...@pld-linux.org> Date: Fri Aug 25 01:58:09 2023 +0200
up to 1.6.4 (new soname) while 1.7.x was already released recently, keep 1.6.x for possibly broadest compatibility libgit2-no-libgit2-test.patch | 4 ++-- libgit2.spec | 24 +++++++++++++++++++----- pcre2-detect.ptch | 27 --------------------------- 3 files changed, 21 insertions(+), 34 deletions(-) --- diff --git a/libgit2.spec b/libgit2.spec index 58039d7..5acd437 100644 --- a/libgit2.spec +++ b/libgit2.spec @@ -7,15 +7,14 @@ Summary: C Git library Summary(pl.UTF-8): Biblioteka Git dla C Name: libgit2 -Version: 1.4.6 +Version: 1.6.4 Release: 1 License: GPL v2 with linking exception Group: Libraries #Source0Download: https://github.com/libgit2/libgit2/releases Source0: https://github.com/libgit2/libgit2/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: db5e2722b90c88ed6aec1aa616201a36 +# Source0-md5: a77d6555a0ebdd6155ae8bae05ed1bd8 Patch0: %{name}-no-libgit2-test.patch -Patch1: pcre2-detect.ptch URL: http://libgit2.github.com/ BuildRequires: cmake >= 3.5.1 %{?with_kerberos5:BuildRequires: heimdal-devel} @@ -57,10 +56,21 @@ Header files for libgit2 library. %description devel -l pl.UTF-8 Pliki nagłówkowe biblioteki libgit2. +%package tools +Summary: Tools for libgit2 library +Summary(pl.UTF-8): Narzędzia dla biblioteki libgit2 +Group: Application +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tools +Tools for libgit2 library. + +%description tools -l pl.UTF-8 +Narzędzia dla biblioteki libgit2. + %prep %setup -q %patch0 -p1 -%patch1 -p1 # Don't test network sed -i '/ADD_TEST(online/s/^/#/' tests/CMakeLists.txt @@ -98,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc AUTHORS docs/contributing.md COPYING README.md %attr(755,root,root) %{_libdir}/libgit2.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgit2.so.1.4 +%attr(755,root,root) %ghost %{_libdir}/libgit2.so.1.6 %files devel %defattr(644,root,root,755) @@ -106,3 +116,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/git2.h %{_includedir}/git2 %{_pkgconfigdir}/libgit2.pc + +%files tools +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/git2 diff --git a/libgit2-no-libgit2-test.patch b/libgit2-no-libgit2-test.patch index acb5691..3dddd12 100644 --- a/libgit2-no-libgit2-test.patch +++ b/libgit2-no-libgit2-test.patch @@ -1,5 +1,5 @@ ---- libgit2-0.20.0/tests/blame/simple.c.orig 2013-11-20 12:53:33.000000000 +0100 -+++ libgit2-0.20.0/tests/blame/simple.c 2013-11-29 16:59:19.887747596 +0100 +--- libgit2-0.20.0/tests/libgit2/blame/simple.c.orig 2013-11-20 12:53:33.000000000 +0100 ++++ libgit2-0.20.0/tests/libgit2/blame/simple.c 2013-11-29 16:59:19.887747596 +0100 @@ -130,7 +130,7 @@ * bf477ed4 include/git2.h 45 (Michael Schubert 2012-02-15 00:33:38 +0100 59 * d12299fe src/git.h 49 (Vicent Martí 2010-12-03 22:22:10 +0200 60 diff --git a/pcre2-detect.ptch b/pcre2-detect.ptch deleted file mode 100644 index 08e0c28..0000000 --- a/pcre2-detect.ptch +++ /dev/null @@ -1,27 +0,0 @@ -From 39627c51f64dca83c9fc3b903079456f3c39a2d3 Mon Sep 17 00:00:00 2001 -From: Jan Palus <jpa...@fastmail.com> -Date: Mon, 27 Jun 2022 10:04:23 +0200 -Subject: [PATCH] cmake: change header used for pcre2 detection - -with pcre2 regex libgit2 uses pcre2.h header instead of pcre2posix.h -(since f585b12), so reflect it in library detection logic ---- - cmake/FindPCRE2.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindPCRE2.cmake b/cmake/FindPCRE2.cmake -index d4b8e6761..41c165b65 100644 ---- a/cmake/FindPCRE2.cmake -+++ b/cmake/FindPCRE2.cmake -@@ -16,7 +16,7 @@ - # PCRE2_FOUND - True if pcre found. - - # Look for the header file. --find_path(PCRE2_INCLUDE_DIR NAMES pcre2posix.h) -+find_path(PCRE2_INCLUDE_DIR NAMES pcre2.h) - - # Look for the library. - find_library(PCRE2_LIBRARY NAMES pcre2-8) --- -2.36.1 - ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libgit2.git/commitdiff/4b968fb1d51f88f6636aabf159cfa0aba0f2df7e _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit