preview of the upcoming upstream release (libssh2-1.7.0-20160217)

This commit is contained in:
Kamil Dudka 2016-02-17 09:48:01 +01:00
parent 1ce9bf4210
commit 87f84dddc1
3 changed files with 8 additions and 21 deletions

View File

@ -3,7 +3,7 @@
--- libssh2/NEWS
+++ libssh2/NEWS
@@ -3552,7 +3552,7 @@ Simon Josefsson (16 Nov 2009)
@@ -5270,7 +5270,7 @@ Simon Josefsson (16 Nov 2009)
- support arcfour128 cipher per RFC 4345
Daniel Stenberg (21 Oct 2009)

View File

@ -1,12 +0,0 @@
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}

View File

@ -11,15 +11,14 @@
%{!?__isa_bits: %global __isa_bits %((echo '#include <bits/wordsize.h>'; echo __WORDSIZE) | cpp - | grep -Ex '32|64')}
Name: libssh2
Version: 1.6.0
Release: 4%{?dist}
Version: 1.6.9999
Release: 1%{?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
Source0: http://libssh2.org/snapshots/libssh2-1.7.0-20160217.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
@ -64,7 +63,7 @@ The libssh2-docs package contains man pages and examples for
developing applications that use libssh2.
%prep
%setup -q
%setup -q -n libssh2-1.7.0-20160217
# Replace hard wired port number in the test suite to avoid collisions
# between 32-bit and 64-bit builds running on a single build-host
@ -73,9 +72,6 @@ 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 || :
@ -153,6 +149,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libssh2.pc
%changelog
* Wed Feb 17 2016 Kamil Dudka <kdudka@redhat.com> - 1.6.9999-1
- preview of the upcoming upstream release (libssh2-1.7.0-20160217)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild