kalev pushed to libgit2-glib (master). "Fix ssh detection"

[notifications at fedoraproject.org]

>From 80db2564c1417b63411d85fa528f3cd839479b1e Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Wed, 15 Apr 2015 00:25:06 +0200
Subject: Fix ssh detection


diff --git a/0001-configure-Include-passed-in-cflags-for-ssh-check.patch b/0001-configure-Include-passed-in-cflags-for-ssh-check.patch
new file mode 100644
index 0000000..f1a430e
--- /dev/null
+++ b/0001-configure-Include-passed-in-cflags-for-ssh-check.patch
@@ -0,0 +1,32 @@
+From 4cee9a9d356ee0fea8ac3aa060ce5b48a7ba62f9 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Wed, 15 Apr 2015 00:08:49 +0200
+Subject: [PATCH] configure: Include passed in cflags for ssh check
+
+This fixes the Fedora 23 build where the cflags and ldflags have to
+match. Otherwise, if the configure check throws away cflags but uses
+ldflags, the check fails with a linker error.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=747874
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8340f7a..240142c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,8 +92,8 @@ if test "x$enable_ssh" != "xno"; then
+     cflags_save="${CFLAGS}"
+     libs_save="${LIBS}"
+ 
+-    CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
+-    LIBS="${LIBGIT2_GLIB_LIBS}"
++    CFLAGS="${CFLAGS} ${LIBGIT2_GLIB_CFLAGS}"
++    LIBS="${LIBS} ${LIBGIT2_GLIB_LIBS}"
+ 
+     AC_TRY_RUN([
+             #include <git2.h>
+-- 
+2.3.5
+
diff --git a/libgit2-glib.spec b/libgit2-glib.spec
index 5a992b0..b65f6ee 100644
--- a/libgit2-glib.spec
+++ b/libgit2-glib.spec
@@ -1,11 +1,13 @@
 Name:           libgit2-glib
 Version:        0.22.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Git library for GLib
 
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/Libgit2-glib
 Source0:        http://download.gnome.org/sources/libgit2-glib/0.22/libgit2-glib-%{version}.tar.xz
+# https://bugzilla.gnome.org/show_bug.cgi?id=747874
+Patch0:         0001-configure-Include-passed-in-cflags-for-ssh-check.patch
 
 BuildRequires:  glib2-devel
 BuildRequires:  libgit2-devel
@@ -33,6 +35,8 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
+autoreconf -fi
 
 
 %build
@@ -68,6 +72,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Tue Apr 14 2015 Kalev Lember <kalevlember at gmail.com> - 0.22.6-2
+- Fix ssh detection
+
 * Tue Apr 14 2015 Kalev Lember <kalevlember at gmail.com> - 0.22.6-1
 - Update to 0.22.6
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libgit2-glib.git/commit/?h=master&id=80db2564c1417b63411d85fa528f3cd839479b1e