[packages/libgit2] add curl,libssh bconds

glen glen at pld-linux.org
Fri May 27 09:25:03 CEST 2016


commit f967805f80e0e4df1f8d4159f8d2771cca5f92ed
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri May 27 10:21:27 2016 +0300

    add curl,libssh bconds

 libgit2.spec | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/libgit2.spec b/libgit2.spec
index 461f55f..9b80cf7 100644
--- a/libgit2.spec
+++ b/libgit2.spec
@@ -2,6 +2,8 @@
 # Conditional build:
 %bcond_without	kerberos5	# GSSAPI for SPNEGO auth
 %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
@@ -17,16 +19,19 @@ Patch0:	        %{name}-test-online.patch
 Patch1:	        %{name}-no-libgit2-test.patch
 URL:		http://libgit2.github.com/
 BuildRequires:	cmake >= 2.8
-BuildRequires:	curl-devel
+%{?with_curl:BuildRequires:	curl-devel}
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	http-parser-devel >= 2
-BuildRequires:	libssh2-devel
+%{?with_libssh:BuildRequires:	libssh2-devel}
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 %{?with_tests:BuildRequires:	python}
 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}}
+
 %description
 libgit2 is a portable, pure C implementation of the Git core methods
 provided as a re-entrant linkable library with a solid API, allowing
@@ -70,9 +75,11 @@ cd build
 %cmake .. \
 	-DINCLUDE_INSTALL_DIR:PATH=include \
 	-DLIB_INSTALL_DIR:PATH=%{_lib} \
-	%{?with_tests_online:-DONLINE_TESTS:BOOL=ON} \
-	-DTHREADSAFE:BOOL=ON \
-	%{?with_kerberos5:-DUSE_GSSAPI:BOOL=ON}
+	%{cmake_with curl CURL} \
+	%{cmake_with kerberos5 USE_GSSAPI} \
+	%{cmake_with libssh USE_SSH} \
+	%{cmake_with tests_online ONLINE_TESTS} \
+	-DTHREADSAFE:BOOL=ON
 %{__make}
 
 %{?with_tests:%{__make} test ARGS="-V"}
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list