From 100ee1da4b5556058987f776d0c14c3d5bec058e Mon Sep 17 00:00:00 2001
From: Martin Kutlak <mkutlak@redhat.com>
Date: Mon, 8 Oct 2018 14:02:19 +0200
Subject: [PATCH] New upstream release 2.9.6

Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
---
 .gitignore                                    |  1 +
 ...t-use-python3-to-get-consumerCertDir.patch | 31 -------------------
 libreport.spec                                | 24 ++++++++++++--
 sources                                       |  2 +-
 4 files changed, 23 insertions(+), 35 deletions(-)
 delete mode 100644 0001-ureport-use-python3-to-get-consumerCertDir.patch

diff --git a/.gitignore b/.gitignore
index 0465349..5f80a43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libreport-2.9.3.tar.gz
 /libreport-2.9.4.tar.gz
 /libreport-2.9.5.tar.gz
+/libreport-2.9.6.tar.gz
diff --git a/0001-ureport-use-python3-to-get-consumerCertDir.patch b/0001-ureport-use-python3-to-get-consumerCertDir.patch
deleted file mode 100644
index e6fe7a6..0000000
--- a/0001-ureport-use-python3-to-get-consumerCertDir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8c00a86dddaf240d4a836a5e278190bcc51b0b66 Mon Sep 17 00:00:00 2001
-From: Matej Habrnal <mhabrnal@redhat.com>
-Date: Mon, 18 Jun 2018 14:51:23 +0200
-Subject: [PATCH] ureport: use python3 to get consumerCertDir
-
-Related to #1592073
-
-Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
----
- src/lib/ureport.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/ureport.c b/src/lib/ureport.c
-index c32c948a..d2045f0f 100644
---- a/src/lib/ureport.c
-+++ b/src/lib/ureport.c
-@@ -81,9 +81,10 @@ rhsm_config_get_consumer_cert_dir(void)
-         return xstrdup(result);
- 
-     result = run_in_shell_and_save_output(0,
--            "python -c \"from rhsm.config import initConfig; print(initConfig().get('rhsm', 'consumerCertDir'))\"",
-+            "python3 -c \"from rhsm.config import initConfig; print(initConfig().get('rhsm', 'consumerCertDir'))\"",
-             NULL, NULL);
- 
-+
-     /* run_in_shell_and_save_output always returns non-NULL */
-     if (result[0] != '/')
-         goto error;
--- 
-2.17.0
-
diff --git a/libreport.spec b/libreport.spec
index 65b387d..7e420b4 100644
--- a/libreport.spec
+++ b/libreport.spec
@@ -28,13 +28,12 @@
 
 Summary: Generic library for reporting various problems
 Name: libreport
-Version: 2.9.5
-Release: 4%{?dist}
+Version: 2.9.6
+Release: 1%{?dist}
 License: GPLv2+
 URL: https://abrt.readthedocs.org/
 Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
-Patch0001: 0001-ureport-use-python3-to-get-consumerCertDir.patch
 
 BuildRequires: %{dbus_devel}
 BuildRequires: gtk3-devel
@@ -91,6 +90,7 @@ to different bug targets like Bugzilla, ftp, trac, etc...
 
 %package filesystem
 Summary: Filesystem layout for libreport
+BuildArch: noarch
 
 %description filesystem
 Filesystem layout for libreport
@@ -258,7 +258,12 @@ BuildRequires: %{libjson_devel}
 Requires: %{name} = %{version}-%{release}
 Requires: libreport-web = %{version}-%{release}
 %if 0%{?rhel}
+%if %{with python2}
 Requires: python-rhsm
+%endif # with python2
+%if %{with python3}
+Requires: python3-subscription-manager-rhsm
+%endif # with python3
 %endif
 
 %description plugin-ureport
@@ -816,6 +821,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Mon Oct 8 2018 Martin Kutlak <mkutlak@redhat.com> 2.9.6-1
+- Fix majority of bugs found by Coverity Scan.
+- Remove option to screencast problems
+- tests: Adjust format of truncated backtrace for python and core
+- gui: Replace deprecated g_type_class_add_private
+- potfiles: fix issue in POTFILES.in
+- lib: fix a SEGV in list_possible_events()
+- ureport: use python3 to get consumerCertDir
+- r-mailx: Add comment explaining expected values in config
+- reporter-mailx: Remove double quotes from config
+- spec: Make libreport-filesystem subpackage noarch
+- spec: drop dependency on python-rhsm
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 182b3ff..c7b0301 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libreport-2.9.5.tar.gz) = 160dcbd9dd1653dde4f2a0dd6ab8c07b7e8ae0bc906b5c586df4e9c3b99a392959f6cac9218632587eb077e6d294a43fb2f221f0845e927728970db2fe323a54
+SHA512 (libreport-2.9.6.tar.gz) = b1b8c1fc706f7b78cb5b1c8cfac783771fafd840fad4129c88ab3284957b595152315d3b6ed5c3aec9bb50b6c8f023c59246091338a6f199704fde3bf17384ef