Hello community, here is the log from the commit of package libgit2 for openSUSE:Factory checked in at 2015-09-17 09:17:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgit2 (Old) and /work/SRC/openSUSE:Factory/.libgit2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgit2" Changes: -------- --- /work/SRC/openSUSE:Factory/libgit2/libgit2.changes 2015-09-08 17:39:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgit2.new/libgit2.changes 2015-09-17 09:17:36.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 10 14:04:07 UTC 2015 - [email protected] + +- Add libgit2-fix-.pc-file.patch: Fix paths written in libgit2.pc. + +------------------------------------------------------------------- New: ---- libgit2-fix-.pc-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgit2.spec ++++++ --- /var/tmp/diff_new_pack.2l7ag9/_old 2015-09-17 09:17:37.000000000 +0200 +++ /var/tmp/diff_new_pack.2l7ag9/_new 2015-09-17 09:17:37.000000000 +0200 @@ -26,6 +26,8 @@ Url: http://libgit2.github.com/ Source0: https://github.com/libgit2/libgit2/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM libgit2-fix-.pc-file.patch [email protected] -- Fix includedir and libdir in libgit2.pc +Patch0: libgit2-fix-.pc-file.patch BuildRequires: cmake >= 2.8 BuildRequires: http-parser-devel BuildRequires: pkgconfig @@ -67,6 +69,7 @@ %prep %setup -q find examples -type f -name ".gitignore" -print -delete +%patch0 -p1 %build %cmake \ ++++++ libgit2-fix-.pc-file.patch ++++++ >From c207ce6bc6893a00e6ebe1fa30d4401580f7097f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Thu, 10 Sep 2015 16:11:10 +0200 Subject: [PATCH] pkg-config: fix directory references in libgit2.pc Before: libdir=/usr//usr/lib64 includedir=/usr//usr/include After: libdir=/usr/lib64 includedir=/usr/include (note the duplication of /usr in the before case) --- CMakeLists.txt | 17 +++++++++++++++++ libgit2.pc.in | 5 +++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 293153f..0ed63c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,23 @@ SET(BIN_INSTALL_DIR bin CACHE PATH "Where to install binaries to.") SET(LIB_INSTALL_DIR lib CACHE PATH "Where to install libraries to.") SET(INCLUDE_INSTALL_DIR include CACHE PATH "Where to install headers to.") +# Set a couple variables to be substituted inside the .pc file. +# We can't just use LIB_INSTALL_DIR in the .pc file, as passing them as absolue +# or relative paths is both valid and supported by cmake. +set (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) + +if(IS_ABSOLUTE ${LIB_INSTALL_DIR}) + set (PKGCONFIG_LIBDIR ${LIB_INSTALL_DIR}) +else(IS_ABSOLUTE ${LIB_INSTALL_DIR}) + set (PKGCONFIG_LIBDIR "\${prefix}/${LIB_INSTALL_DIR}") +endif (IS_ABSOLUTE ${LIB_INSTALL_DIR}) + +if(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR}) + set (PKGCONFIG_INCLUDEDIR ${INCLUDE_INSTALL_DIR}) +else(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR}) + set (PKGCONFIG_INCLUDEDIR "\${prefix}/${INCLUDE_INSTALL_DIR}") +endif(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR}) + FUNCTION(TARGET_OS_LIBRARIES target) IF(WIN32) TARGET_LINK_LIBRARIES(${target} ws2_32) diff --git a/libgit2.pc.in b/libgit2.pc.in index 3d825a4..880266a 100644 --- a/libgit2.pc.in +++ b/libgit2.pc.in @@ -1,5 +1,6 @@ -libdir=@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ +prefix=@PKGCONFIG_PREFIX@ +libdir=@PKGCONFIG_LIBDIR@ +includedir=@PKGCONFIG_INCLUDEDIR@ Name: libgit2 Description: The git library, take 2 -- 2.5.0
