From f5160109f2f2692a881dc73039b2e52519d7a1c8 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 10 Dec 2020 01:43:57 +0100
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/satyr.git#871cfb2bb25490f7153571a53d8dbf643403500c
---
 .gitignore |  5 +++++
 satyr.spec | 23 ++++++++++++++++++-----
 sources    |  2 +-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c5ff3e..e5d1daa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,8 @@
 /satyr-0.29.tar.gz
 /satyr-0.30.tar.gz
 /satyr-0.31.tar.gz
+/satyr-0.32.tar.gz
+/satyr-0.32.2.g6dec.dirty.tar.gz
+/satyr-0.33.tar.gz
+/satyr-0.34.tar.gz
+/satyr-0.35.tar.gz
diff --git a/satyr.spec b/satyr.spec
index 4798d95..c345186 100644
--- a/satyr.spec
+++ b/satyr.spec
@@ -13,13 +13,15 @@
   %define libelf_devel elfutils-libelf-devel
 %endif
 
+%define glib_ver 2.43.4
+
 Name: satyr
-Version: 0.31
-Release: 3%{?dist}
+Version: 0.35
+Release: 1%{?dist}
 Summary: Tools to create anonymous, machine-friendly problem reports
 License: GPLv2+
 URL: https://github.com/abrt/satyr
-Source0: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0: https://github.com/abrt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
 %if %{with python3}
 BuildRequires: python3-devel
 %endif # with python3
@@ -30,17 +32,20 @@ BuildRequires: rpm-devel
 BuildRequires: libtool
 BuildRequires: doxygen
 BuildRequires: pkgconfig
+BuildRequires: make
 BuildRequires: automake
 BuildRequires: gcc-c++
 BuildRequires: gdb
 BuildRequires: gperf
 BuildRequires: nettle-devel
-BuildRequires: pkgconfig(json-c)
+BuildRequires: json-c-devel
+BuildRequires: glib2-devel
 %if %{with python3}
 BuildRequires: python3-sphinx
 %endif # with python3
 Requires: json-c%{?_isa}
 Requires: nettle%{?_isa}
+Requires: glib2%{?_isa} >= %{glib_ver}
 
 %description
 Satyr is a library that can be used to create and process microreports.
@@ -91,6 +96,7 @@ find %{buildroot} -name "*.la" -delete
 make check|| {
     # find and print the logs of failed test
     # do not cat tests/testsuite.log because it contains a lot of bloat
+    cat tests/test-suite.log
     find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \;
     exit 1
 }
@@ -103,7 +109,7 @@ make check|| {
 %endif
 
 %files
-%doc README NEWS
+%doc README.md NEWS
 %license COPYING
 %{_bindir}/satyr
 %{_mandir}/man1/%{name}.1*
@@ -123,6 +129,13 @@ make check|| {
 %endif
 
 %changelog
+* Tue Dec 01 2020 Michal Fabik <mfabik@redhat.com> 0.35-1
+- New upstream version
+ - Fix leaks in koops stacktrace- and report-handling code
+ - Replace utility code with GLib functions
+ - Fix unit test portability issue
+ - Add build dependency on make
+
 * Tue Aug 18 2020 Michal Fabik <mfabik@redhat.com> - 0.31-1
 - Remove #define PyString_AsString PyUnicode_AsUTF8
 - python: Adapt to changes made in PEP 590
diff --git a/sources b/sources
index dd71a99..480457e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (satyr-0.31.tar.gz) = eb9280f216f446694b2c07be5c7512429fc4c59881d661274a2390af519b95d7701685e27da76c12245ccb8ffd87f2616027673fb1ff133fe8b79e3e78c7906a
+SHA512 (satyr-0.35.tar.gz) = 2a01759b80cfcb2d8ee930610285d8e0727a19c30d9616e9114573b60c0eaba695ff9daa79d8c585f5fb586d5f0865fcd1660a7fde492e1cec04536236cf07ba