Accepting request 1067316 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/1067316
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcbor?expand=0&rev=6

libcbor.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Feb 22 09:27:59 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
+
+- Merge change from SLE15 SP4 made by pgajdos@suse.com on
+  Tue Apr  5 14:36:56 UTC 2022:
+- do not build manual page for 15sp4, it does not succeed
+  [bsc#1197743]
+- added sources
+  + libcbor.3
+
 -------------------------------------------------------------------
 Mon Jan 16 15:32:07 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
 
@@ -53,6 +63,9 @@ Mon May 25 08:15:42 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 
 - Update to version 0.7.0
   * Too many changes to list, see included CHANGELOG.md file
+- 0.6.0 includes patch by bwiedemann@suse.com to not build shared
+  lib twice and make package build reproducible (boo#1102408,
+  gh#PJK/libcbor#72)
 
 -------------------------------------------------------------------
 Thu Jan  2 22:06:08 UTC 2020 - Torsten Gruner <t.gruner@katodev.de>

libcbor.spec

@@ -21,6 +21,18 @@
 %define soage      1
 %define lname   libcbor%{socurrent}_%{sorevision}
 %global flavor @BUILD_FLAVOR@%{nil}
+
+%if "%{flavor}" == "doc"
+# in 15sp4/sp5, the doc fails to build with an assert in sphinx
+%if 0%{?sle_version} >= 150400 && 0%{?sle_version} <= 150500
+%define build_man 0
+%else
+%define build_man 1
+%endif
+%else
+%define build_man 0
+%endif
+
 %if "%{flavor}" == "doc"
 Name:           libcbor-doc
 %else
@@ -33,7 +45,8 @@ License:        MIT
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/PJK/libcbor
 Source0:        https://github.com/PJK/libcbor/archive/v%{version}.tar.gz
-%if "%{flavor}" == "doc"
+Source1:        libcbor.3
+%if %{build_man}
 BuildRequires:  doxygen
 BuildRequires:  python3-Sphinx
 BuildRequires:  python3-breathe
@@ -78,7 +91,7 @@ sed -i 's|${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig|${CMAKE_INST
 %build
 export CFLAGS="%(echo %{optflags}) -Wno-return-type"
 export CXXFLAGS="$CFLAGS"
-%if "%{flavor}" == "doc"
+%if %{build_man}
 %make_build -C doc man
 %else
 
@@ -89,8 +102,13 @@ export CXXFLAGS="$CFLAGS"
 
 %install
 %if "%{flavor}" == "doc"
+
 mkdir -p %{buildroot}%{_mandir}/man3
+%if %{build_man}
 cp doc/build/man/*.3 %{buildroot}%{_mandir}/man3
+%else
+cp %{SOURCE1} %{buildroot}%{_mandir}/man3
+%endif
 
 %else