Accepting request 1179326 from devel:libraries:c_c++

- Fix baselibs.conf for libcmocka-cmake subpackage OBS-URL: https://build.opensuse.org/request/show/1179326 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmocka?expand=0&rev=22
Fix baselibs
2024-06-09 18:19:04 +00:00 · 2024-06-07 14:03:57 +00:00 · 2024-06-07 13:52:13 +00:00 · 2024-06-07 13:50:33 +00:00 · 2024-06-07 11:09:40 +00:00 · 2023-09-02 20:07:01 +00:00
3 changed files with 46 additions and 14 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -2,6 +2,8 @@ libcmocka0
    provides "libcmocka-<targettype> = <version>"
    obsoletes "libmockery-<targettype> <= <version>"
 libcmocka-devel
-    +/usr/lib(64)?/cmake/cmocka/.*
    requires -"libcmocka-<targettype>"
    requires "libcmocka0-<targettype> = <version>"
+libcmocka-cmake
+    +/usr/lib(64)?/cmake/cmocka/.*
+    requires "libcmocka-devel-<targettype> = <version>"
--- a/cmocka.changes
+++ b/cmocka.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jun  7 11:09:17 UTC 2024 - Andreas Schneider <asn@cryptomilk.org>
+
+- Fix baselibs.conf for libcmocka-cmake subpackage
+
+-------------------------------------------------------------------
+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>

--- a/cmocka.spec
+++ b/cmocka.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cmocka
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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:       cmake
+Requires:       libcmocka-devel = %{version}
+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
Author	SHA256	Message	Date
Ana Guerrero	54b2545096	Accepting request 1179326 from devel:libraries:c_c++ - Fix baselibs.conf for libcmocka-cmake subpackage OBS-URL: https://build.opensuse.org/request/show/1179326 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmocka?expand=0&rev=22	2024-06-09 18:19:04 +00:00
Andreas Schneider	f9fada635a	Fix baselibs OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmocka?expand=0&rev=63	2024-06-07 14:03:57 +00:00
Andreas Schneider	69b795c471	Fix baselibs.conf OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmocka?expand=0&rev=62	2024-06-07 13:52:13 +00:00
Andreas Schneider	640d81b271	Fix requires OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmocka?expand=0&rev=61	2024-06-07 13:50:33 +00:00
Andreas Schneider	38313c6fce	Fix baselibs.conf for libcmocka-cmake subpackage OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmocka?expand=0&rev=60	2024-06-07 11:09:40 +00:00
Dominique Leuenberger	8bb104dcaa	Accepting request 1108441 from devel:libraries:c_c++ OBS-URL: https://build.opensuse.org/request/show/1108441 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmocka?expand=0&rev=21	2023-09-02 20:07:01 +00:00
Andreas Schneider	94ccfd53b4	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	2023-09-01 11:23:03 +00:00
Andreas Schneider	76736e3df1	Revert latest changes which do not work OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmocka?expand=0&rev=57	2023-08-29 09:25:24 +00:00
Andreas Schneider	3099e3d60f	Accepting request 1105410 from home:mwilck:branches:devel:libraries:c_c++ - 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/1105410 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmocka?expand=0&rev=56	2023-08-23 07:58:14 +00:00