Accepting request 638974 from devel:libraries:c_c++

- Update to version 1.1.3
  * Fixed subunit output on failures
  * Do not abort if a test is skipped
  * Switched to Modern CMake
- Removed 0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch

OBS-URL: https://build.opensuse.org/request/show/638974
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmocka?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2018-10-02 17:42:43 +00:00 committed by Git OBS Bridge
commit 5511a46215
7 changed files with 31 additions and 82 deletions

View File

@ -1,58 +0,0 @@
From 3f6e116314e13c0a7126ab234fe32dd8a5e31658 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
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 <asn@cryptomilk.org>
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d11cd1e129827ff240a501c1c43557e808de89e8fcd8ab9e963c8db419332bdd
size 82300

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAluGtM8ACgkQfuD8TcwB
Tj0svQ/8D/vFldh9hD+jo2VQbIqBMJ5dAmVZjD1CakTI93aGzQCa1gysINKiRk2o
r+Dwk3sVQus27x8fKvTeOWKmpRmm3089OuZgyFEFmIE0W6V4D5o02bmnmcRzeA4A
31LivzEDBsSIQl3Ael8dZ+E5Nd0tOZ+YEqPUCsahD1kPeHBLXQMu5LJwFWgbgWzK
h11sZ7poeJrx2eROzIQCj4f2BjCOJ7LVqdcI/c/pihHU0aj2lr269xp0mNUhd5lT
GuNKK5m3YHFlQZi0sk4wesWdzrOv96Gy5tuqvvSwhd16pu5AFbCaVsUPq/G86wi4
4JMixyAKBh8on4rIRWDoczZJhhklaSgWYSweVEIkDo6xR9wp0HmxCfNguGPc8mSX
1aBkYo9Nh6EpK2HRHVg1aDJHgd9zdY24iJtNG7njwn+Z0gO27Yi26LRnM6bmYLqh
44vWDJ6SKXUSnVtvwxgP5r4rD0Cbr4LNbIIywXjJm6OhWSGUPyenUiyCX/6tk+m7
TA7Yuqhgd7rDZuqqOQYozomieZabUQ5b1byc6PF4emQ999KFVGPS4WR85V1DiheK
HuetTo67gICdZUz2KQeSMd34gf78Rnff87JRHo8SgCcNjSqzHWML/Um1N+3loe2n
iUclSFjebFf13KVVC1Fk7HhdXko8kfXKV4ksxJC81v0cO9gxVzk=
=H04h
-----END PGP SIGNATURE-----

3
cmocka-1.1.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43eabcf72a9c80e3d03f7c8a1c04e408c18d2db5121eb058a3ef732a9dfabfaf
size 78744

16
cmocka-1.1.3.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAlus2xIACgkQfuD8TcwB
Tj3+og//f1gl973q/yEI/PSZ50prPp0Qocr+0OqCMIDAwnqzZr3A+dwuDVjJ4uNI
vf98zx66Tm/FbpAxGOAHu/zGjLix2QPkWF+30JIOK+75XP4Nc4h6y+nvJrd90rfY
pj+dZP6ySzdmwsgb4gE7HcUBTohEBpN7YdaDzqm6n2FyJqDK78CjjC9xQtrAlsuh
PD87rcOXDgpsFFzFEpwFqIqKlmMd4jZcGWE5Ga815lWvzB3vIcb5ABieI0eObRjz
C6tfR7uBk++aXFAqqnI5ioCBuizibhOgIphmMnsQIJ3NI/0vQQyGk4NWzeHy2tF4
z0Y0GF5WRgNds1YI4oMnYV+LiFHBlZoQnVYq1lhzueALQ+37EUDBXs6Zgy24csN0
nl4lRXRbkSUOFKdtzk6QTE1ezNozUW1LNyoGkKGfLMggdq5Vnq19xE4nq2mOh0vM
NOb1jvVpeu2GkucgBhlspRQVhCFKMDRVereZJEuEc4OCGfpRlQrxJVP8JnrLSIC/
whGA63ZZdYY6feP+Ido+eCI9ZSWtouewtsyspJ0w/ZuBIRMA3Pnd0jRUu8oFEjIT
QtYNVN/HcDnYbdXmcY9Uojh78UTeuomGdn/Q/8q+830caLxqtgy0w4fgnwRHLzzV
FqoStsCMAVg/uAYvpgdUt+LqYzxAeXmc20IPqmYSLXy8S5eeGcc=
=96cs
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Sep 27 13:58:03 UTC 2018 - Andreas Schneider <asn@cryptomilk.org>
- Update to version 1.1.3
* Fixed subunit output on failures
* Do not abort if a test is skipped
* Switched to Modern CMake
- Removed 0001-cmake-Only-support-building-docs-the-on-cmake-3.9.patch
-------------------------------------------------------------------
Thu Aug 30 08:04:05 UTC 2018 - Andreas Schneider <asn@cryptomilk.org>

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -24,7 +24,7 @@
%endif
Name: cmocka
Version: 1.1.2
Version: 1.1.3
Release: 0
Summary: Lightweight library to simplify and generalize unit tests for C
License: Apache-2.0
@ -36,8 +36,6 @@ 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
@ -152,6 +150,6 @@ popd
%{_libdir}/cmake/cmocka/cmocka-config.cmake
%files -n libcmocka-devel-static
%{_libdir}/libcmocka.a
%{_libdir}/libcmocka-static.a
%changelog