Accepting request 663779 from devel:libraries:c_c++

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

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>

libssh.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan  8 13:14:24 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
+
+- Added the tests in a multiple build description file *test* to
+  break the cycle for cmocka, curl, doxygen and libssh.
+
 -------------------------------------------------------------------
 Sun Dec 30 16:15:23 UTC 2018 - Andreas Schneider <asn@cryptomilk.org>
 

libssh.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libssh
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,27 +23,40 @@
 %bcond_with docs
 %endif
 
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%bcond_without test
+%else
+%bcond_with test
+%endif
+
+%if %{with test}
+Name:           libssh-%{flavor}
+%else
 Name:           libssh
+%endif
 Version:        0.8.6
 Release:        0
 Summary:        The SSH library
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://www.libssh.org
-Source0:        https://www.libssh.org/files/0.8/%{name}-%{version}.tar.xz
-Source1:        https://www.libssh.org/files/0.8/%{name}-%{version}.tar.xz.asc
-Source2:        https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D.gpg#/%{name}.keyring
+Source0:        https://www.libssh.org/files/0.8/libssh-%{version}.tar.xz
+Source1:        https://www.libssh.org/files/0.8/libssh-%{version}.tar.xz.asc
+Source2:        https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D.gpg#/libssh.keyring
 Source99:       baselibs.conf
 Patch0:         0001-disable-timeout-test-on-slow-buildsystems.patch
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  krb5-devel
-BuildRequires:  libcmocka-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  xz
 BuildRequires:  zlib-devel
+%if %{with test}
+BuildRequires:  libcmocka-devel
+%endif
 
 %description
 An SSH implementation in the form of a library. With libssh, you can remotely
@@ -74,32 +87,34 @@ Requires:       libssh4 = %{version}
 %description devel
 Development headers for the SSH library.
 
-%if %{with docs}
 %package devel-doc
 Summary:        SSH library API documentation
 Group:          Documentation/HTML
 
 %description devel-doc
 Documentation for libssh development.
-%endif # with docs
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n libssh-0.8.6
 
 %build
 
-%ifarch s390 s390x ppc64le
-	%define slow_test_system "ON"
-%else
-	%define slow_test_system "OFF"
+%if %{with test}
+ %ifarch s390 s390x ppc64le
+        %define slow_test_system "ON"
+ %else
+        %define slow_test_system "OFF"
+ %endif
 %endif
 
 %cmake \
     -DCMAKE_C_FLAGS:STRING="%{optflags} -DOPENSSL_LOAD_CONF" \
+%if %{with test}
     -DUNIT_TESTING="ON" \
+    -DSLOW_TEST_SYSTEM=%{slow_test_system} \
+%endif
     -DWITH_GSSAPI=ON \
-    -DWITH_EXAMPLES="OFF" \
-    -DSLOW_TEST_SYSTEM=%{slow_test_system}
+    -DWITH_EXAMPLES="OFF"
 
 make %{?_smp_mflags}
 %if %{with docs}
@@ -107,12 +122,17 @@ make %{?_smp_mflags} docs
 %endif # with docs
 
 %install
+%if !%{with test}
 %cmake_install
+%endif
 
 %check
 cd build
+%if %{with test}
 ctest --output-on-failure
+%endif
 
+%if !%{with test}
 %post -n libssh4 -p /sbin/ldconfig
 %postun -n libssh4 -p /sbin/ldconfig
 
@@ -132,5 +152,6 @@ ctest --output-on-failure
 %files devel-doc
 %doc build/doc/html
 %endif # with docs
+%endif
 
 %changelog