Accepting request 935771 from home:dirkmueller:Factory
- 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 OBS-URL: https://build.opensuse.org/request/show/935771 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libcbor?expand=0&rev=14
This commit is contained in:
parent
cb54356eef
commit
0df425b421
3
_multibuild
Normal file
3
_multibuild
Normal file
@ -0,0 +1,3 @@
|
||||
<multibuild>
|
||||
<package>doc</package>
|
||||
</multibuild>
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:618097166ea4a54499646998ccaa949a5816e6a665cf1d6df383690895217c8b
|
||||
size 267044
|
3
libcbor-0.9.0.tar.gz
Normal file
3
libcbor-0.9.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:da81e4f9333e0086d4e2745183c7052f04ecc4dbcffcf910029df24f103c15d1
|
||||
size 275405
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
58
libcbor.spec
58
libcbor.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libcbor
|
||||
#
|
||||
# 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,28 @@
|
||||
|
||||
|
||||
%define socurrent 0
|
||||
%define sorevision 8
|
||||
%define sorevision 9
|
||||
%define soage 0
|
||||
|
||||
%define lname libcbor%{socurrent}_%{sorevision}
|
||||
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
Name: libcbor
|
||||
Version: 0.8.0
|
||||
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
|
||||
URL: https://github.com/PJK/libcbor
|
||||
Source0: https://github.com/PJK/libcbor/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
BuildRequires: cmake
|
||||
%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 +46,20 @@ a general-purpose schema-less binary data format.
|
||||
|
||||
It supports flexible memory management, UTF-8, streams & incremental
|
||||
processing, and has a layered architecture.
|
||||
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for libcbor - Concise Binary Object Representation (CBOR)
|
||||
Group: System/Libraries
|
||||
|
||||
%description doc
|
||||
libcbor is a C99 library for parsing and generating CBOR (RFC 7049),
|
||||
a general-purpose schema-less binary data format.
|
||||
|
||||
It supports flexible memory management, UTF-8, streams & incremental
|
||||
processing, and has a layered architecture.
|
||||
|
||||
This package provides additional documentation.
|
||||
|
||||
%package -n %{lname}
|
||||
Summary: Library for parsing Concise Binary Object Representation (CBOR)
|
||||
Group: System/Libraries
|
||||
@ -71,25 +85,36 @@ The libcbor-devel contains libraries and header files for libcbor.
|
||||
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
|
||||
%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 +126,6 @@ cp doc/build/man/* %{buildroot}%{_mandir}/man1
|
||||
%{_includedir}/cbor/internal/*.h
|
||||
%{_libdir}/libcbor.so
|
||||
%{_libdir}/pkgconfig/libcbor.pc
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
Loading…
x
Reference in New Issue
Block a user