From b9d0124b85f032a524f8bd47d3606aa94a8fd84a Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 7 Apr 2017 16:38:00 +0200
Subject: [PATCH] Update to cmocka-1.1.1

---
 .gitignore                                  |  1 +
 cmocka-1.0.0-fix_build_with_newer_gcc.patch | 40 ---------------------
 cmocka-1.1.0-workaround-ppc64le-gcc.patch   | 12 -------
 cmocka.spec                                 |  2 +-
 sources                                     |  2 +-
 5 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 cmocka-1.0.0-fix_build_with_newer_gcc.patch
 delete mode 100644 cmocka-1.1.0-workaround-ppc64le-gcc.patch

diff --git a/.gitignore b/.gitignore
index b8a81d1..863cd6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /cmocka-1.0.0.tar.xz
 /cmocka-1.0.1.tar.xz
 /cmocka-1.1.0.tar.xz
+/cmocka-1.1.1.tar.xz
diff --git a/cmocka-1.0.0-fix_build_with_newer_gcc.patch b/cmocka-1.0.0-fix_build_with_newer_gcc.patch
deleted file mode 100644
index a8b0362..0000000
--- a/cmocka-1.0.0-fix_build_with_newer_gcc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ab0f3769a08de746e0aed60665dfa2638ae3e61d Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Fri, 20 Feb 2015 09:47:44 +0100
-Subject: [PATCH 1/2] include: Fix building with newer gcc versions.
-
-__func__ is not a macro. We just need to define it on Windows for now.
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- include/cmocka.h | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/include/cmocka.h b/include/cmocka.h
-index 303d0ae..43336e8 100644
---- a/include/cmocka.h
-+++ b/include/cmocka.h
-@@ -19,6 +19,8 @@
- #ifdef _WIN32
- # ifdef _MSC_VER
- 
-+#define __func__ __FUNCTION__
-+
- # ifndef inline
- #define inline __inline
- # endif /* inline */
-@@ -52,11 +54,6 @@ int __stdcall IsDebuggerPresent();
-  * @{
-  */
- 
--/* For those who are used to __func__ from gcc. */
--#ifndef __func__
--#define __func__ __FUNCTION__
--#endif
--
- /* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */
- #ifndef __WORDSIZE
- # if defined(__x86_64__) && !defined(__ILP32__)
--- 
-2.1.0
-
diff --git a/cmocka-1.1.0-workaround-ppc64le-gcc.patch b/cmocka-1.1.0-workaround-ppc64le-gcc.patch
deleted file mode 100644
index 36327f1..0000000
--- a/cmocka-1.1.0-workaround-ppc64le-gcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up cmocka-1.1.0/cmake/Modules/DefineCompilerFlags.cmake.than cmocka-1.1.0/cmake/Modules/DefineCompilerFlags.cmake
---- cmocka-1.1.0/cmake/Modules/DefineCompilerFlags.cmake.than	2017-03-27 08:07:21.231279206 -0400
-+++ cmocka-1.1.0/cmake/Modules/DefineCompilerFlags.cmake	2017-03-27 08:08:04.852048525 -0400
-@@ -10,7 +10,7 @@ if (UNIX AND NOT WIN32)
-     if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
- 
-         # add -Wconversion ?
--        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
-+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -fno-builtin-strcmp -pedantic -pedantic-errors")
-         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
-         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
-         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -Wundef")
diff --git a/cmocka.spec b/cmocka.spec
index 4883d47..0dd6007 100644
--- a/cmocka.spec
+++ b/cmocka.spec
@@ -3,7 +3,7 @@ BuildRequires:  doxygen
 BuildRequires:  glibc-devel
 
 Name:           cmocka
-Version:        1.1.0
+Version:        1.1.1
 Release:        5%{?dist}
 
 License:        ASL 2.0
diff --git a/sources b/sources
index f850699..30886f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59c9aa5735d9387fb591925ec53523ec  cmocka-1.1.0.tar.xz
+SHA512 (cmocka-1.1.1.tar.xz) = 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577