[packages/libgit2] - updated to 0.24.1, fixed cmake options

qboosh qboosh at pld-linux.org
Fri Jun 24 21:31:44 CEST 2016


commit ce3c80807efba592920695193809998ff654d7f6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jun 24 21:31:45 2016 +0200

    - updated to 0.24.1, fixed cmake options

 libgit2.spec | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/libgit2.spec b/libgit2.spec
index de0ff91..1483992 100644
--- a/libgit2.spec
+++ b/libgit2.spec
@@ -1,20 +1,21 @@
 #
 # Conditional build:
+%bcond_without	curl		# Use cURL for HTTP
 %bcond_without	kerberos5	# GSSAPI for SPNEGO auth
+%bcond_without	libssh		# SSH support via libssh2
 %bcond_without	tests		# build without tests
-%bcond_without	libssh		# Link with libssh2 to enable SSH support
-%bcond_without	curl		# Use cURL for HTTP
 %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.24.0
+Version:	0.24.1
 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:	8cabf04502d7203793b32f47ca410ae3
+# Source0-md5:	3674ca2d40388b1175e25b6f5a3a82ad
 Patch0:	        %{name}-test-online.patch
 Patch1:	        %{name}-no-libgit2-test.patch
 URL:		http://libgit2.github.com/
@@ -30,7 +31,7 @@ BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # Usage: cmake_with BCOND_NAME [OPTION_NAME]
-%define		cmake_with() %{expand:%%{?with_%{1}:-D%{?2}%{!?2:%{1}}=BOOL:ON}%%{!?with_%{1}:-D%{?2}%{!?2:%{1}}=BOOL:OFF}}
+%define		cmake_on_off() -D%{?2}%{!?2:%{1}}:BOOL=%{expand:%%{?with_%{1}:ON}%%{!?with_%{1}:OFF}}
 
 %description
 libgit2 is a portable, pure C implementation of the Git core methods
@@ -75,11 +76,11 @@ cd build
 %cmake .. \
 	-DINCLUDE_INSTALL_DIR:PATH=include \
 	-DLIB_INSTALL_DIR:PATH=%{_lib} \
-	%{cmake_with tests BUILD_CLAR} \
-	%{cmake_with curl CURL} \
-	%{cmake_with kerberos5 USE_GSSAPI} \
-	%{cmake_with libssh USE_SSH} \
-	%{cmake_with tests_online ONLINE_TESTS} \
+	%{cmake_on_off tests BUILD_CLAR} \
+	%{cmake_on_off curl CURL} \
+	%{cmake_on_off kerberos5 USE_GSSAPI} \
+	%{cmake_on_off libssh USE_SSH} \
+	%{cmake_on_off tests_online ONLINE_TESTS} \
 	-DTHREADSAFE:BOOL=ON
 %{__make}
 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list