diff --git a/libssh2/libssh2.patch b/libssh2/libssh2.patch index 8cb5b85ccf..2a126cdf43 100644 --- a/libssh2/libssh2.patch +++ b/libssh2/libssh2.patch @@ -1,6 +1,6 @@ -Index: libssh-0.4.6/cmake/Modules/DefineCompilerFlags.cmake ---- libssh-0.4.6/cmake/Modules/DefineCompilerFlags.cmake.orig 2010-02-13 13:13:58 +0100 -+++ libssh-0.4.6/cmake/Modules/DefineCompilerFlags.cmake 2010-02-13 18:08:29 +0100 +Index: libssh-0.4.7/cmake/Modules/DefineCompilerFlags.cmake +--- libssh-0.4.7/cmake/Modules/DefineCompilerFlags.cmake.orig 2010-02-13 13:13:58 +0100 ++++ libssh-0.4.7/cmake/Modules/DefineCompilerFlags.cmake 2010-02-13 18:08:29 +0100 @@ -13,11 +13,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") endif (WITH_FPIC) @@ -13,9 +13,9 @@ Index: libssh-0.4.6/cmake/Modules/DefineCompilerFlags.cmake check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) if (WITH_FORTIFY_SOURCE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") -Index: libssh-0.4.6/include/libssh/priv.h ---- libssh-0.4.6/include/libssh/priv.h.orig 2010-02-13 13:13:58 +0100 -+++ libssh-0.4.6/include/libssh/priv.h 2010-02-13 18:07:21 +0100 +Index: libssh-0.4.7/include/libssh/priv.h +--- libssh-0.4.7/include/libssh/priv.h.orig 2010-02-13 13:13:58 +0100 ++++ libssh-0.4.7/include/libssh/priv.h 2010-02-13 18:07:21 +0100 @@ -250,5 +250,9 @@ } #endif diff --git a/libssh2/libssh2.spec b/libssh2/libssh2.spec index 61862b1979..aa670155b5 100644 --- a/libssh2/libssh2.spec +++ b/libssh2/libssh2.spec @@ -23,7 +23,8 @@ # package version %define V_libssh2 1.2.7 -%define V_libssh 0.4.6 +%define V_libssh_dir 0.4 +%define V_libssh 0.4.7 # package information Name: libssh2 @@ -36,14 +37,14 @@ Class: PLUS Group: SSH License: BSD-style Version: %{V_libssh2} -Release: 20100906 +Release: 20101231 # package options %option with_perl no # list of sources Source0: http://www.libssh2.org/download/libssh2-%{V_libssh2}.tar.gz -Source1: http://www.libssh.org/files/libssh-%{V_libssh}.tar.gz +Source1: http://www.libssh.org/files/%{V_libssh_dir}/libssh-%{V_libssh}.tar.gz Patch0: libssh2.patch # build information @@ -65,7 +66,7 @@ PreReq: openssl, zlib } prog libssh2:libssh = { version = %{V_libssh} - url = http://www.libssh.org/files/ + url = http://www.libssh.org/files/%{V_libssh_dir}/ regex = libssh-(__VER__)\.tar\.gz }