Hello community, here is the log from the commit of package cmocka for openSUSE:Factory checked in at 2018-09-04 22:48:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmocka (Old) and /work/SRC/openSUSE:Factory/.cmocka.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmocka" Tue Sep 4 22:48:57 2018 rev:15 rq:632444 version:1.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cmocka/cmocka.changes 2017-04-17 10:22:56.354866875 +0200 +++ /work/SRC/openSUSE:Factory/.cmocka.new/cmocka.changes 2018-09-04 22:48:59.699525569 +0200 @@ -1,0 +2,17 @@ +Thu Aug 30 08:04:05 UTC 2018 - Andreas Schneider <[email protected]> + +- Fix packaging the documentation +- Added 0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch + +------------------------------------------------------------------- +Wed Aug 29 15:15:03 UTC 2018 - Andreas Schneider <[email protected]> + +- Update to version 1.1.2 + * Added function to filter tests (cmocka_set_test_filter) + * Added new mocking example (uptime) + * Fixed fixture error reporting + * Fixed compiler flags detection + * Some improvement for API documentation +- Added HTML documentation + +------------------------------------------------------------------- Old: ---- cmocka-1.1.1.tar.xz New: ---- 0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch cmocka-1.1.2.tar.xz cmocka-1.1.2.tar.xz.asc cmocka.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmocka.spec ++++++ --- /var/tmp/diff_new_pack.GUQTJz/_old 2018-09-04 22:49:00.311527673 +0200 +++ /var/tmp/diff_new_pack.GUQTJz/_new 2018-09-04 22:49:00.315527687 +0200 @@ -1,7 +1,7 @@ # # spec file for package cmocka # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,30 @@ # +%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 150000 +%bcond_without docs +%else +# We need cmake >= 3.9 to build docs +%bcond_with docs +%endif + Name: cmocka -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: Lightweight library to simplify and generalize unit tests for C License: Apache-2.0 Group: Productivity/Networking/Other -Url: http://cmocka.org +URL: https://cmocka.org + Source0: https://cmocka.org/files/1.1/%{name}-%{version}.tar.xz -Source1: baselibs.conf +Source1: https://cmocka.org/files/1.1/%{name}-%{version}.tar.xz.asc +Source2: %{name}.keyring +Source3: baselibs.conf + +Patch0: 0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch + BuildRequires: cmake +BuildRequires: doxygen BuildRequires: glibc-devel BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,7 +105,7 @@ Static cmocka unit testing library. %prep -%setup -q +%autosetup -p1 %build %cmake \ @@ -101,16 +115,16 @@ -DUNIT_TESTING=ON make %{?_smp_mflags} +%if %{with docs} +make docs +%endif # with docs %install %cmake_install %check pushd build -make %{?_smp_mflags} test || { - cat Testing/Temporary/LastTest.log; - exit 1; -} +ctest --output-on-failure popd %post -n libcmocka0 -p /sbin/ldconfig @@ -118,12 +132,14 @@ %postun -n libcmocka0 -p /sbin/ldconfig %files -n libcmocka0 -%defattr(-,root,root) -%doc AUTHORS README ChangeLog COPYING +%doc AUTHORS README.md ChangeLog +%license COPYING %{_libdir}/libcmocka.so.* %files -n libcmocka-devel -%defattr(-,root,root) +%if %{with docs} +%doc build/doc/html +%endif # with docs %{_includedir}/cmocka.h %{_includedir}/cmocka_pbc.h %dir %{_includedir}/cmockery @@ -136,7 +152,6 @@ %{_libdir}/cmake/cmocka/cmocka-config.cmake %files -n libcmocka-devel-static -%defattr(-,root,root) %{_libdir}/libcmocka.a %changelog ++++++ 0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch ++++++ >From 3f6e116314e13c0a7126ab234fe32dd8a5e31658 Mon Sep 17 00:00:00 2001 From: Andreas Schneider <[email protected]> Date: Wed, 29 Aug 2018 21:49:08 +0200 Subject: [PATCH 1/2] cmake: Only support building docs the on cmake >= 3.9 Fixes #2 --- doc/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 4e3dc23..24ed569 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,6 +1,8 @@ # # Build the documentation # +if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.9.0") + find_package(Doxygen) if (DOXYGEN_FOUND) @@ -39,3 +41,5 @@ if (DOXYGEN_FOUND) ${cmocka-headers_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) endif(DOXYGEN_FOUND) + +endif() # CMAKE_VERSION -- 2.18.0 >From 4114b15f01953cbe01c4cbc2018cb982815cb566 Mon Sep 17 00:00:00 2001 From: Andreas Schneider <[email protected]> Date: Thu, 30 Aug 2018 07:35:22 +0200 Subject: [PATCH 2/2] cmake: VERSION_GREATER_EQUAL is not suppored by cmake 3.3 --- doc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 24ed569..8c3426f 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,7 +1,7 @@ # # Build the documentation # -if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.9.0") +if (${CMAKE_VERSION} VERSION_GREATER "3.8.99") find_package(Doxygen) -- 2.18.0 ++++++ cmocka-1.1.1.tar.xz -> cmocka-1.1.2.tar.xz ++++++ ++++ 9033 lines of diff (skipped)
