Hello community, here is the log from the commit of package libssh for openSUSE:Factory checked in at 2019-01-15 13:15:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libssh (Old) and /work/SRC/openSUSE:Factory/.libssh.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libssh" Tue Jan 15 13:15:59 2019 rev:53 rq:663779 version:0.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libssh/libssh.changes 2019-01-03 18:04:36.836247794 +0100 +++ /work/SRC/openSUSE:Factory/.libssh.new.28833/libssh.changes 2019-01-15 13:16:17.688361562 +0100 @@ -1,0 +2,6 @@ +Tue Jan 8 13:14:24 UTC 2019 - Pedro Monreal Gonzalez <[email protected]> + +- Added the tests in a multiple build description file *test* to + break the cycle for cmocka, curl, doxygen and libssh. + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libssh.spec ++++++ --- /var/tmp/diff_new_pack.lrbWx2/_old 2019-01-15 13:16:18.196361163 +0100 +++ /var/tmp/diff_new_pack.lrbWx2/_new 2019-01-15 13:16:18.196361163 +0100 @@ -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 @@ %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 +%if %{with test} + %ifarch s390 s390x ppc64le %define slow_test_system "ON" -%else + %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 @@ %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 @@ %files devel-doc %doc build/doc/html %endif # with docs +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild>
