From 08367842ae7893124d7b1aaa23c79222b021703f0a3a84767ac1cdc143c6143b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 24 Apr 2013 16:31:10 +0000 Subject: [PATCH] Accepting request 173167 from home:bmanojlovic:branches:devel:libraries:c_c++ fixed building on older OS/sle targets OBS-URL: https://build.opensuse.org/request/show/173167 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libssh2_org?expand=0&rev=45 --- libssh2_org.changes | 5 +++++ libssh2_org.spec | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libssh2_org.changes b/libssh2_org.changes index e51bfef..3d32d05 100644 --- a/libssh2_org.changes +++ b/libssh2_org.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 24 07:54:17 UTC 2013 - boris@steki.net + +- fix building on older kernels and older OS / SLE + ------------------------------------------------------------------- Thu Feb 28 21:13:29 UTC 2013 - crrodriguez@opensuse.org diff --git a/libssh2_org.spec b/libssh2_org.spec index d185f68..6c77650 100644 --- a/libssh2_org.spec +++ b/libssh2_org.spec @@ -67,11 +67,17 @@ SECSH-PUBLICKEY. %prep %setup -q -n %{pkg_name}-%{version} +# problem with sle 11 sp1 target as it has older kernel and as such fail this +%if 0%{?suse_version} > 1110 %patch -p1 +%endif %build sed -i -e 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g' configure.ac cp src/libssh2_config.h.in example/libssh2_config.h +# remove m4 macro files for libtool as they should be picked up by +# autoreconf +rm -v m4/libtool.m4 m4/lt* autoreconf -fiv export CFLAGS="%optflags -DOPENSSL_LOAD_CONF" %configure \ @@ -80,12 +86,18 @@ export CFLAGS="%optflags -DOPENSSL_LOAD_CONF" --with-openssl=%{_prefix} make %{?_smp_mflags} +%if !0%{?sles_version} + %if 0%{?suse_version} >= 1230 + %check make check + %endif +%endif + %install make install DESTDIR=%{buildroot} -rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a %post -n libssh2-1 -p /sbin/ldconfig