Accepting request 1108263 from home:mwilck:branches:devel:libraries:c_c++

- 4th attempt to split off the -cmake and -doc subpackages. Supersedes sr#1107991.
- replaced "Supplements" of libcmocka-cmake with conditional requires of libcmocka-devel. This should pull in the cmake support wherever it's required.
- added dependency of libcmocka-cmake on libcmocka-devel to make cmake(cmocka) build dependencies work. socket_wrapper builds successfully now with this cmocka package.
- Fixed "/usr/lib64" issue with previous submission (sr#1105410)


- split off -doc and -cmake subpackages, which aren't necessary
  for basic development with cmocka, to avoid pulling in the
  entire cmake-full package (38MB) with libcmocka-devel
- minor simplifications in spec file

OBS-URL: https://build.opensuse.org/request/show/1108263
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmocka?expand=0&rev=58
This commit is contained in:
Andreas Schneider 2023-09-01 11:23:03 +00:00 committed by Git OBS Bridge
parent 76736e3df1
commit 94ccfd53b4
2 changed files with 37 additions and 12 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Aug 23 06:30:05 UTC 2023 - Martin Wilck <mwilck@suse.com>
- split off -doc and -cmake subpackages, which aren't necessary
for basic development with cmocka, to avoid pulling in the
entire cmake-full package (38MB) with libcmocka-devel
- minor simplifications in spec file
-------------------------------------------------------------------
Fri May 5 09:26:51 UTC 2023 - Andreas Schneider <asn@cryptomilk.org>

View File

@ -88,13 +88,32 @@ compilers.
%package -n libcmocka-devel
Summary: Development headers for the cmocka library
Group: Development/Libraries/C and C++
Requires: cmake
Requires: libcmocka0 = %{version}
Requires: pkg-config
Requires: (libcmocka-cmake if cmake)
%description -n libcmocka-devel
Development headers for the cmocka unit testing library.
%package -n libcmocka-doc
Summary: Documentation for the cmocka library
Group: Development/Libraries/C and C++
Enhances: libcmocka-devel
Provides: libcmocka-devel:%{_defaultdocdir}/libcmocka-devel
%description -n libcmocka-doc
Documentation for the cmocka unit testing library.
%package -n libcmocka-cmake
Summary: cmake support for the cmocka library
Group: Development/Libraries/C and C++
Requires: libcmocka-devel = %{version}
Requires: cmake
Provides: libcmocka-devel:%{_libdir}/cmake/cmocka
%description -n libcmocka-cmake
cmake support for developing with the cmocka unit testing library.
%prep
%autosetup -p1
@ -130,20 +149,18 @@ popd
%{_libdir}/libcmocka.so.*
%files -n libcmocka-devel
%if %{with docs}
%doc build/doc/html
#endif with docs
%endif
%{_includedir}/cmocka.h
%{_includedir}/cmocka_pbc.h
%dir %{_includedir}/cmockery
%{_includedir}/cmockery/cmockery.h
%{_includedir}/cmockery/pbc.h
%{_includedir}/cmockery
%{_libdir}/libcmocka.so
%{_libdir}/pkgconfig/cmocka.pc
%dir %{_libdir}/cmake/cmocka
%{_libdir}/cmake/cmocka/cmocka-config-relwithdebinfo.cmake
%{_libdir}/cmake/cmocka/cmocka-config-version.cmake
%{_libdir}/cmake/cmocka/cmocka-config.cmake
%if %{with docs}
%files -n libcmocka-doc
%doc build/doc/html
%endif
%files -n libcmocka-cmake
%{_libdir}/cmake/cmocka
%changelog