Accepting request 317785 from devel:libraries:c_c++

1

OBS-URL: https://build.opensuse.org/request/show/317785
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libssh?expand=0&rev=39

libssh.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 20 09:29:46 UTC 2015 - tchvatal@suse.com
+
+- Enable testsuite run to check the state of libssh itself
+- Use SUSE macros to define environment clearly
+- Enable gssapi by adding krb5 dependency
+
 -------------------------------------------------------------------
 Tue Jun 30 07:36:31 UTC 2015 - asn@cryptomilk.org
 

libssh.spec

@@ -16,26 +16,25 @@
 #
 
 
-BuildRequires:  cmake
-BuildRequires:  doxygen
-BuildRequires:  gcc-c++
-BuildRequires:  openssl-devel
-BuildRequires:  pkgconfig
-BuildRequires:  xz
-
 Name:           libssh
 Version:        0.7.1
 Release:        0
-
 Summary:        The SSH library
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            https://www.libssh.org
-
+# Dynamic number: https://red.libssh.org/projects/libssh/files
 Source0:        %{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 Patch0:         gcc5-fixes.patch
-
+BuildRequires:  cmake
+BuildRequires:  doxygen
+BuildRequires:  gcc-c++
+BuildRequires:  krb5-devel
+BuildRequires:  libcmocka-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -86,36 +85,33 @@ Group:          Development/Languages/C and C++
 Documentation for libssh development.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0
 
 %build
-if test ! -e "build"; then
+%cmake \
-  mkdir build
-fi
-pushd build
-cmake \
     -DCMAKE_C_FLAGS:STRING="%{optflags} -DOPENSSL_LOAD_CONF" \
-  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DWITH_CLIENT_TESTING="OFF" \
-  -DCMAKE_SKIP_RPATH=ON \
+    -DWITH_TESTING="ON" \
-  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+    -DWITH_GSSAPI=ON \
-%if %{_lib} == lib64
+    -DWITH_BENCHMARKS="OFF" \
-  -DLIB_SUFFIX=64 \
+    -DWITH_EXAMPLES="OFF"
-%endif
-  %{_builddir}/%{name}-%{version}
 
-make %{?_smp_mflags} VERBOSE=1
+make %{?_smp_mflags}
-%__make doc
+make %{?_smp_mflags} doc
-popd
 
 %install
-pushd build
+%cmake_install
-%if 0%{?suse_version}
+
-%makeinstall
+# remove the static libs, we don't want them installed, needed by tests
-%else
+rm -rf %{buildroot}%{_libdir}/*.a
-%__make DESTDIR=%{buildroot} install
+
-%endif
+%check
-popd
+cd build
+make %{?_smp_mflags} test || {
+    cat Testing/Temporary/LastTest.log;
+    exit 1;
+}
 
 %post -n libssh4 -p /sbin/ldconfig