From 5a6c8e52d0013a683cc0e8056187bda02cd2a181 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 18 Oct 2015 15:49:30 +0200
Subject: [PATCH] - updated to 0.23.3 - update test-online patch

---
 libgit2-test-online.patch | 28 ++++++++++++----------------
 libgit2.spec              | 17 +++++++++++------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/libgit2-test-online.patch b/libgit2-test-online.patch
index cae7686..e7ee6de 100644
--- a/libgit2-test-online.patch
+++ b/libgit2-test-online.patch
@@ -1,18 +1,14 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 10caa16..714d86c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -359,7 +359,12 @@ IF (BUILD_CLAR)
- 	ENDIF ()
+--- 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()
--	ADD_TEST(libgit2_clar libgit2_clar -ionline)
-+        IF (ONLINE_TESTS)
-+	    ADD_TEST(libgit2_clar libgit2_clar -ionline)
-+        ELSE ()
-+	    ADD_TEST(libgit2_clar libgit2_clar -xonline -xnetwork::remote::remotes)
-+        ENDIF ()
-+
- ENDIF ()
- 
- IF (TAGS)
+ 	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 ()
diff --git a/libgit2.spec b/libgit2.spec
index b0e3ad3..2c4a8e9 100644
--- a/libgit2.spec
+++ b/libgit2.spec
@@ -1,24 +1,28 @@
 #
 # Conditional build:
+%bcond_without	kerberos5	# GSSAPI for SPNEGO auth
 %bcond_without	tests		# build without tests
 %bcond_with	tests_online	# build with tests reqiuring online access
 
 Summary:	C git library
 Summary(pl.UTF-8):	Biblioteka git dla C
 Name:		libgit2
-Version:	0.22.2
+Version:	0.23.3
 Release:	1
 License:	GPL v2 with linking exception
 Group:		Libraries
 Source0:	https://github.com/libgit2/libgit2/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	7b21448c471dc76a3ca4801b61ac856a
+# Source0-md5:	b33d043f655cc0671aeb95d62a75c981
 Patch0:	        %{name}-test-online.patch
 Patch1:	        %{name}-no-libgit2-test.patch
 URL:		http://libgit2.github.com/
-BuildRequires:	cmake >= 2.6
-BuildRequires:	http-parser-devel
+BuildRequires:	cmake >= 2.8
+BuildRequires:	curl-devel
+%{?with_kerberos5:BuildRequires:	heimdal-devel}
+BuildRequires:	http-parser-devel >= 2
 BuildRequires:	libssh2-devel
 BuildRequires:	openssl-devel
+BuildRequires:	pkgconfig
 %{?with_tests:BuildRequires:	python}
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,7 +71,8 @@ cd build
 	-DINCLUDE_INSTALL_DIR:PATH=include \
 	-DLIB_INSTALL_DIR:PATH=%{_lib} \
 	%{?with_tests_online:-DONLINE_TESTS:BOOL=ON} \
-	-DTHREADSAFE:BOOL=ON
+	-DTHREADSAFE:BOOL=ON \
+	%{?with_kerberos5:-DUSE_GSSAPI:BOOL=ON}
 %{__make}
 
 %{?with_tests:%{__make} test ARGS="-V"}
@@ -87,7 +92,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.22
+%attr(755,root,root) %ghost %{_libdir}/libgit2.so.23
 
 %files devel
 %defattr(644,root,root,755)
-- 
2.44.0