Accepting request 673374 from devel:libraries:c_c++

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

libssh.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 11 12:24:43 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Drop doxygen from dependencies to avoid buildcycle
+  * the documentation is available online anyway for anyone to
+    consume and consult http://api.libssh.org
+
 -------------------------------------------------------------------
 Tue Jan  8 13:14:24 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 

libssh.spec

@@ -16,25 +16,15 @@
 #
 
 
-%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 150000
-%bcond_without docs
-%else
-# We need cmake >= 3.9 to build docs
-%bcond_with docs
-%endif
-
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
+%define suffix -test
 %bcond_without test
 %else
+%define suffix %{nil}
 %bcond_with test
 %endif
-
-%if %{with test}
-Name:           libssh-%{flavor}
-%else
-Name:           libssh
-%endif
+Name:           libssh%{suffix}
 Version:        0.8.6
 Release:        0
 Summary:        The SSH library
@@ -47,13 +37,14 @@ Source2:        https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC
 Source99:       baselibs.conf
 Patch0:         0001-disable-timeout-test-on-slow-buildsystems.patch
 BuildRequires:  cmake
-BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  krb5-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  xz
 BuildRequires:  zlib-devel
+# doxygen generated documentation used to be in subpkg
+Obsoletes:      %{name}-devel-docs
 %if %{with test}
 BuildRequires:  libcmocka-devel
 %endif
@@ -117,9 +108,6 @@ Documentation for libssh development.
     -DWITH_EXAMPLES="OFF"
 
 make %{?_smp_mflags}
-%if %{with docs}
-make %{?_smp_mflags} docs
-%endif # with docs
 
 %install
 %if !%{with test}
@@ -127,9 +115,8 @@ make %{?_smp_mflags} docs
 %endif
 
 %check
-cd build
 %if %{with test}
-ctest --output-on-failure
+%ctest
 %endif
 
 %if !%{with test}
@@ -147,11 +134,6 @@ ctest --output-on-failure
 %dir %{_libdir}/cmake/libssh
 %{_libdir}/cmake/libssh/libssh-config.cmake
 %{_libdir}/cmake/libssh/libssh-config-version.cmake
-
-%if %{with docs}
-%files devel-doc
-%doc build/doc/html
-%endif # with docs
 %endif
 
 %changelog