diff --git a/libcbor.changes b/libcbor.changes index 6c7bdd2..30ed901 100644 --- a/libcbor.changes +++ b/libcbor.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 7 15:27:11 UTC 2021 - Dirk Müller + +- fix duplicate src package name issue on multibuild + ------------------------------------------------------------------- Sun Dec 5 09:42:57 UTC 2021 - Dirk Müller diff --git a/libcbor.spec b/libcbor.spec index 82b1788..5bf7eca 100644 --- a/libcbor.spec +++ b/libcbor.spec @@ -1,5 +1,5 @@ # -# spec file for package libcbor +# spec file for package libcbor-doc # # Copyright (c) 2021 SUSE LLC # @@ -21,14 +21,18 @@ %define soage 0 %define lname libcbor%{socurrent}_%{sorevision} %global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "doc" +Name: libcbor-doc +%else Name: libcbor +%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: https://github.com/PJK/libcbor -Source0: https://github.com/PJK/libcbor/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/PJK/libcbor/archive/v%{version}.tar.gz %if "%{flavor}" == "doc" BuildRequires: doxygen BuildRequires: python3-Sphinx @@ -47,19 +51,6 @@ 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 @@ -81,7 +72,7 @@ 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 @@ -107,7 +98,7 @@ cp doc/build/man/* %{buildroot}%{_mandir}/man1 %postun -n %{lname} -p /sbin/ldconfig %if "%{flavor}" == "doc" -%files doc +%files %doc CHANGELOG.md README.md %{_mandir}/*/* diff --git a/libcbor-0.9.0.tar.gz b/v0.9.0.tar.gz similarity index 100% rename from libcbor-0.9.0.tar.gz rename to v0.9.0.tar.gz