[packages/libgit2] - override INCLUDE_INSTALL_DIR and LIB_INSTALL_DIR coming from cmake macro to fix paths in .pc file

qboosh qboosh at pld-linux.org
Sat Jan 4 18:03:53 CET 2014


commit b96b78fdd777d8c0c4b1eab659a768a3a6c073b5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 4 18:04:25 2014 +0100

    - override INCLUDE_INSTALL_DIR and LIB_INSTALL_DIR coming from cmake macro to fix paths in .pc file
    - completed -devel dependencies (from .pc)
    - release 2

 libgit2.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/libgit2.spec b/libgit2.spec
index c907a8a..2f79d39 100644
--- a/libgit2.spec
+++ b/libgit2.spec
@@ -7,7 +7,7 @@ Summary:	C git library
 Summary(pl.UTF-8):	Biblioteka git dla C
 Name:		libgit2
 Version:	0.20.0
-Release:	1
+Release:	2
 License:	GPL v2 with linking exception
 Group:		Libraries
 Source0:	https://github.com/libgit2/libgit2/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
@@ -40,6 +40,8 @@ Summary:	Header files for libgit2 library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libgit2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	http-parser-devel
+Requires:	libssh2-devel
 Requires:	openssl-devel
 Requires:	zlib-devel
 
@@ -57,7 +59,13 @@ Pliki nagłówkowe biblioteki libgit2.
 %build
 install -d build
 cd build
+# CMakeLists.txt supports only relative LIB_INSTALL_DIR and INCLUDE_INSTALL_DIR
+# (otherwise .pc file is generated incorrectly).
+# Type (:PATH or :STRING) must be specified explicitly to avoid expansion
+# relative to cwd.
 %cmake .. \
+	-DINCLUDE_INSTALL_DIR:PATH=include \
+	-DLIB_INSTALL_DIR:PATH=%{_lib} \
 	%{?with_tests_online:-DONLINE_TESTS=1}
 %{__make}
 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list