[packages/libgit2] - up to 0.26.0

arekm arekm at pld-linux.org
Wed Nov 22 22:37:06 CET 2017


commit 915109a7433a326ca3e72122dc8da14aad3e58ee
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Nov 22 22:36:58 2017 +0100

    - up to 0.26.0

 libgit2-test-online.patch | 14 --------------
 libgit2.spec              | 13 +++++++------
 2 files changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/libgit2.spec b/libgit2.spec
index e78c7c1..baa7322 100644
--- a/libgit2.spec
+++ b/libgit2.spec
@@ -9,15 +9,14 @@
 Summary:	C Git library
 Summary(pl.UTF-8):	Biblioteka Git dla C
 Name:		libgit2
-Version:	0.25.1
+Version:	0.26.0
 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:	3b285ce94200f00c34962711f001b192
-Patch0:	        %{name}-test-online.patch
-Patch1:	        %{name}-no-libgit2-test.patch
+# Source0-md5:	6ea75a8a5745a7b2a14d3ed94486e761
+Patch0:		%{name}-no-libgit2-test.patch
 URL:		http://libgit2.github.com/
 BuildRequires:	cmake >= 2.8
 %{?with_curl:BuildRequires:	curl-devel}
@@ -64,7 +63,9 @@ Pliki nagłówkowe biblioteki libgit2.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
+# Don't test network
+sed -i 's/ionline/xonline/' CMakeLists.txt
 
 %build
 install -d build
@@ -101,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS CONTRIBUTING.md COPYING README.md
 %attr(755,root,root) %{_libdir}/libgit2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgit2.so.25
+%attr(755,root,root) %ghost %{_libdir}/libgit2.so.26
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/libgit2-test-online.patch b/libgit2-test-online.patch
deleted file mode 100644
index e7ee6de..0000000
--- a/libgit2-test-online.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libgit2-0.23.3/CMakeLists.txt.orig	2015-10-18 14:13:01.342360169 +0200
-+++ libgit2-0.23.3/CMakeLists.txt	2015-10-18 14:15:26.742357088 +0200
-@@ -588,7 +588,11 @@
- 
- 	ENABLE_TESTING()
- 	IF (WINHTTP OR OPENSSL_FOUND OR SECURITY_FOUND)
-+		IF (ONLINE_TESTS)
- 		ADD_TEST(libgit2_clar libgit2_clar -ionline)
-+		ELSE ()
-+			ADD_TEST(libgit2_clar libgit2_clar -xonline -xnetwork::remote::remotes)
-+		ENDIF ()
- 	ELSE ()
- 		ADD_TEST(libgit2_clar libgit2_clar -v)
- 	ENDIF ()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgit2.git/commitdiff/915109a7433a326ca3e72122dc8da14aad3e58ee



More information about the pld-cvs-commit mailing list