Accepting request 936282 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/936282
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcbor?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2021-12-12 20:27:33 +00:00 committed by Git OBS Bridge
commit 879874e8bb
5 changed files with 59 additions and 22 deletions

3
_multibuild Normal file
View File

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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:618097166ea4a54499646998ccaa949a5816e6a665cf1d6df383690895217c8b
size 267044

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Dec 7 15:27:11 UTC 2021 - Dirk Müller <dmueller@suse.com>
- fix duplicate src package name issue on multibuild
-------------------------------------------------------------------
Sun Dec 5 09:42:57 UTC 2021 - Dirk Müller <dmueller@suse.com>
- update to 0.9.0:
* Improved pkg-config paths handling
* Use explicit math.h linkage
* BREAKING: Fixed handling of items that exceed the host size_t range
* cbor_decode explicitly checks size to avoid overflows (previously broken,
potentially resulting in erroneous decoding on affected systems)
- split docs into multibuild flavor to avoid build cycle via openssh<->
python-pyOpenSSL <-> python-cryptography
-------------------------------------------------------------------
Tue Sep 22 11:42:03 UTC 2020 - Ismail Dönmez <idonmez@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package libcbor
# spec file for package libcbor-doc
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,27 +17,32 @@
%define socurrent 0
%define sorevision 8
%define sorevision 9
%define soage 0
%define lname libcbor%{socurrent}_%{sorevision}
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "doc"
Name: libcbor-doc
%else
Name: libcbor
Version: 0.8.0
%endif
Version: 0.9.0
Release: 0
Summary: Library for parsing Concise Binary Object Representation (CBOR)
License: MIT
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
URL: https://github.com/PJK/libcbor
Source0: https://github.com/PJK/libcbor/archive/v%{version}.tar.gz
%if "%{flavor}" == "doc"
BuildRequires: doxygen
BuildRequires: python3-Sphinx
BuildRequires: python3-breathe
%else
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libcmocka-devel
BuildRequires: ninja
BuildRequires: python3-Sphinx
BuildRequires: python3-breathe
BuildRequires: valgrind
%endif
%description
libcbor is a C99 library for parsing and generating CBOR (RFC 7049),
@ -45,7 +50,7 @@ a general-purpose schema-less binary data format.
It supports flexible memory management, UTF-8, streams & incremental
processing, and has a layered architecture.
%package -n %{lname}
Summary: Library for parsing Concise Binary Object Representation (CBOR)
Group: System/Libraries
@ -67,29 +72,40 @@ libcbor is a C library for parsing and generating CBOR.
The libcbor-devel contains libraries and header files for libcbor.
%prep
%autosetup
%autosetup -n libcbor-%{version}
sed -i 's|${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig|${CMAKE_INSTALL_LIBDIR}/pkgconfig|' src/CMakeLists.txt
%build
make %{?_smp_mflags} -C doc man
%if "%{flavor}" == "doc"
%make_build -C doc man
%else
%define __builder ninja
%cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=ON
%cmake_build
%endif
%install
%cmake_install
%if "%{flavor}" == "doc"
mkdir -p %{buildroot}%{_mandir}/man1
cp doc/build/man/* %{buildroot}%{_mandir}/man1
%else
%cmake_install
%endif
%post -n %{lname} -p /sbin/ldconfig
%postun -n %{lname} -p /sbin/ldconfig
%files -n %{lname}
%if "%{flavor}" == "doc"
%files
%doc CHANGELOG.md README.md
%license LICENSE.md
%{_mandir}/*/*
%else
%files -n %{lname}
%license LICENSE.md
%{_libdir}/libcbor.so.%{socurrent}.%{sorevision}
%{_libdir}/libcbor.so.%{socurrent}.%{sorevision}.%{soage}
@ -101,5 +117,6 @@ cp doc/build/man/* %{buildroot}%{_mandir}/man1
%{_includedir}/cbor/internal/*.h
%{_libdir}/libcbor.so
%{_libdir}/pkgconfig/libcbor.pc
%endif
%changelog

3
v0.9.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da81e4f9333e0086d4e2745183c7052f04ecc4dbcffcf910029df24f103c15d1
size 275405