From eb271841330bda1963ae9745bc67f8f426280550 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Wed, 11 Nov 2015 09:07:53 +0000
Subject: Fix pkg-config --libs output (#1279966)

---
 libssh2-1.6.0-pkgconfig.patch | 12 ++++++++++++
 libssh2.spec                  |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 libssh2-1.6.0-pkgconfig.patch

diff --git a/libssh2-1.6.0-pkgconfig.patch b/libssh2-1.6.0-pkgconfig.patch
new file mode 100644
index 0000000..6cd69fc
--- /dev/null
+++ b/libssh2-1.6.0-pkgconfig.patch
@@ -0,0 +1,12 @@
+Remove LDFLAGS from pkg-config --libs output (#1279966)
+
+--- libssh2.pc.in
++++ libssh2.pc.in
+@@ -12,6 +12,6 @@ URL: http://www.libssh2.org/
+ Description: Library for SSH-based communication
+ Version: @LIBSSH2VER@
+ Requires.private: @LIBSREQUIRED@
+-Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@
++Libs: -L${libdir} -lssh2 @LIBS@
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
diff --git a/libssh2.spec b/libssh2.spec
index 17a4bc4..437f3ec 100644
--- a/libssh2.spec
+++ b/libssh2.spec
@@ -12,13 +12,14 @@
 
 Name:		libssh2
 Version:	1.6.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A library implementing the SSH2 protocol
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://www.libssh2.org/
 Source0:	http://libssh2.org/download/libssh2-%{version}.tar.gz
 Patch0:		libssh2-1.4.2-utf8.patch
+Patch1:		libssh2-1.6.0-pkgconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
@@ -72,6 +73,9 @@ sed -i s/4711/47%{?__isa_bits}/ tests/ssh2.{c,sh}
 # Make sure things are UTF-8...
 %patch0 -p1
 
+# Fix pkg-config --libs output (#1279966)
+%patch1
+
 # Make sshd transition appropriately if building in an SELinux environment
 %if !(0%{?fedora} >= 17 || 0%{?rhel} >= 7)
 chcon $(/usr/sbin/matchpathcon -n /etc/rc.d/init.d/sshd) tests/ssh2.sh || :
@@ -149,6 +153,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libssh2.pc
 
 %changelog
+* Tue Nov 10 2015 Paul Howarth <paul@city-fan.org> - 1.6.0-3
+- Fix pkg-config --libs output (#1279966)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-- 
cgit