From c239c72ced469ddd0d8a8a121e5d0ca9aa6c3a2e Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Thu, 16 Nov 2017 11:01:52 -0500
Subject: [PATCH] INI: Remove definiton of TRACE_LEVEL

---
 INI-Remove-definiton-of-TRACE_LEVEL.patch | 34 +++++++++++++++++++++++
 ding-libs.spec                            |  6 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 INI-Remove-definiton-of-TRACE_LEVEL.patch

diff --git a/INI-Remove-definiton-of-TRACE_LEVEL.patch b/INI-Remove-definiton-of-TRACE_LEVEL.patch
new file mode 100644
index 0000000..ba4c1f7
--- /dev/null
+++ b/INI-Remove-definiton-of-TRACE_LEVEL.patch
@@ -0,0 +1,34 @@
+From 8509cfaa757c0f8cc4d79357613f46d2fd9ee878 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
+Date: Wed, 15 Nov 2017 18:31:47 +0100
+Subject: [PATCH] INI: Remove definiton of TRACE_LEVEL
+
+Macros TRACE_LEVEL 7 and TRACE_HOME should only be defined
+in testing builds where we want debug messages to be generated.
+
+The macros are leftovers from the previous patch where they
+were improperly added for debug purposes.
+
+Resolves:
+https://pagure.io/SSSD/ding-libs/issue/3182
+
+Reviewed-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b)
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ ini/ini_augment.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/ini/ini_augment.c b/ini/ini_augment.c
+index 9d83ad9..5a5a173 100644
+--- a/ini/ini_augment.c
++++ b/ini/ini_augment.c
+@@ -32,8 +32,6 @@
+ #include <sys/types.h>
+ #include <regex.h>
+ #include <unistd.h>
+-#define TRACE_LEVEL 7
+-#define TRACE_HOME
+ #include "trace.h"
+ #include "collection.h"
+ #include "collection_tools.h"
diff --git a/ding-libs.spec b/ding-libs.spec
index 0f4fe92..be6bd62 100644
--- a/ding-libs.spec
+++ b/ding-libs.spec
@@ -1,6 +1,6 @@
 Name: ding-libs
 Version: 0.6.1
-Release: 35%{?dist}
+Release: 36%{?dist}
 Summary: "Ding is not GLib" assorted utility libraries
 Group: Development/Libraries
 License: LGPLv3+
@@ -20,6 +20,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
 Patch0: INI-Silence-ini_augment-match-failures.patch
+Patch1: INI-Remove-definiton-of-TRACE_LEVEL.patch
 
 ### Dependencies ###
 # ding-libs is a meta-package that will pull in all of its own
@@ -361,6 +362,9 @@ rm -f */doc/html/installdox
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Nov 16 2017 Robbie Harwood <rharwood@redhat.com> - 0.6.1-36
+- INI: Remove definiton of TRACE_LEVEL
+
 * Tue Nov 14 2017 Robbie Harwood <rharwood@redhat.com> - 0.6.1-35
 - INI: Silence ini_augment match failures