Accepting request 760578 from home:Simmphonie:yubico

fix build for factory

OBS-URL: https://build.opensuse.org/request/show/760578
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libcbor?expand=0&rev=8

libcbor.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan  2 22:06:08 UTC 2020 - Torsten Gruner <t.gruner@katodev.de>
+
+- remove documentation build with doxygen
+
 -------------------------------------------------------------------
 Fri Sep 28 18:57:09 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
 

libcbor.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libcbor
 #
-# 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
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 %define sover  0
@@ -26,15 +26,14 @@ Group:          Development/Libraries/C and C++
 URL:            http://libcbor.org
 Source0:        https://github.com/PJK/libcbor/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires:  cmake
-BuildRequires:  doxygen
-BuildRequires:  libcmocka-devel
 BuildRequires:  gcc-c++
-BuildRequires:  pkg-config
+BuildRequires:  libcmocka-devel
-BuildRequires:  python3-breathe
 BuildRequires:  python3-Sphinx
 BuildRequires:  python3-Sphinx-doc
-BuildRequires:  python3-sphinx_rtd_theme
+BuildRequires:  python3-breathe
 BuildRequires:  python3-packaging
+BuildRequires:  python3-sphinx_rtd_theme
+BuildRequires:  python3-tools
 BuildRequires:  python3-ujson
 BuildRequires:  valgrind
 
@@ -68,10 +67,9 @@ The libcbor-devel contains libraries and header files for libcbor.
 %prep
 %autosetup
 sed -i 's|${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig|${CMAKE_INSTALL_LIBDIR}/pkgconfig|' src/CMakeLists.txt
+2to3 -w doc/source/conf.py
 
 %build
-mkdir -p doc/build/doxygen
-doxygen
 make %{?_smp_mflags} -C doc man
 %cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=ON
 make %{?_smp_mflags}
@@ -87,6 +85,7 @@ cp doc/build/man/* %{buildroot}%{_mandir}/man1
 
 %files -n %{lname}
 %doc README.md
+%license LICENSE.md
 %{_mandir}/*/*
 %{_libdir}/libcbor.so.%{sover}
 %{_libdir}/libcbor.so.%{sover}.?.?
@@ -99,6 +98,5 @@ cp doc/build/man/* %{buildroot}%{_mandir}/man1
 %{_includedir}/cbor/internal/*.h
 %{_libdir}/libcbor.so
 %{_libdir}/pkgconfig/libcbor.pc
-%license LICENSE.md
 
 %changelog