From dfa3ff2590da210b28f0fe5bbccc0da980087181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= <mgrabovs@redhat.com>
Date: Mon, 17 Jan 2022 19:00:22 +0100
Subject: [PATCH] New upstream release 2.16.0

---
 .gitignore                                    |  1 +
 ...ts-Don-t-use-deprecated-assertEquals.patch | 49 -------------------
 libreport.spec                                | 23 ++++++---
 sources                                       |  2 +-
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 0001-tests-Don-t-use-deprecated-assertEquals.patch

diff --git a/.gitignore b/.gitignore
index 88f39e4..0add075 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /libreport-2.14.0.tar.gz
 /libreport-2.15.1.tar.gz
 /libreport-2.15.2.tar.gz
+/libreport-2.16.0.tar.gz
diff --git a/0001-tests-Don-t-use-deprecated-assertEquals.patch b/0001-tests-Don-t-use-deprecated-assertEquals.patch
deleted file mode 100644
index 44514fb..0000000
--- a/0001-tests-Don-t-use-deprecated-assertEquals.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 976d3ffcee73a5d832cb757f2dc39aea21abd2f2 Mon Sep 17 00:00:00 2001
-From: Michal Fabik <mfabik@redhat.com>
-Date: Thu, 4 Nov 2021 22:14:08 +0100
-Subject: [PATCH] tests: Don't use deprecated assertEquals
-
-unittest.assertEquals was deprecated in Python 3.2 and will no longer be
-supported in 3.11
-
-Resolves:
-https://bugzilla.redhat.com/show_bug.cgi?id=2019402
----
- tests/client_python.at | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tests/client_python.at b/tests/client_python.at
-index d026ed70..75ec1890 100644
---- a/tests/client_python.at
-+++ b/tests/client_python.at
-@@ -35,22 +35,22 @@ class TestReportClientVerbose(unittest.TestCase):
-         del sys.modules["reportclient"]
- 
-     def test_default(self):
--        self.assertEquals(self.reportclient.verbose, 0)
-+        self.assertEqual(self.reportclient.verbose, 0)
- 
-     def test_assign(self):
-         self.reportclient.set_verbosity(1)
--        self.assertEquals(self.reportclient.verbose, 1)
--        self.assertEquals(os.environ["ABRT_VERBOSE"], "1")
-+        self.assertEqual(self.reportclient.verbose, 1)
-+        self.assertEqual(os.environ["ABRT_VERBOSE"], "1")
- 
-     def test_load_from_environ(self):
-         os.environ["ABRT_VERBOSE"] = "2"
-         reload(self.reportclient)
--        self.assertEquals(self.reportclient.verbose, 2)
-+        self.assertEqual(self.reportclient.verbose, 2)
- 
-     def test_recover_from_invalid_environ(self):
-         os.environ["ABRT_VERBOSE"] = "foo"
-         reload(self.reportclient)
--        self.assertEquals(self.reportclient.verbose, 0)
-+        self.assertEqual(self.reportclient.verbose, 0)
- 
- 
- if __name__ == "__main__":
--- 
-2.31.1
-
diff --git a/libreport.spec b/libreport.spec
index 567f4f7..bbfe1f8 100644
--- a/libreport.spec
+++ b/libreport.spec
@@ -14,15 +14,12 @@
 
 Summary: Generic library for reporting various problems
 Name: libreport
-Version: 2.15.2
-Release: 11%{?dist}
+Version: 2.16.0
+Release: 1%{?dist}
 License: GPLv2+
 URL: https://abrt.readthedocs.org/
 Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2019402
-Patch0: 0001-tests-Don-t-use-deprecated-assertEquals.patch
-
 BuildRequires: %{dbus_devel}
 BuildRequires: gtk3-devel
 BuildRequires: curl-devel
@@ -37,8 +34,7 @@ BuildRequires: texinfo
 BuildRequires: asciidoc
 BuildRequires: xmlto
 BuildRequires: newt-devel
-BuildRequires: libproxy-devel
-BuildRequires: satyr-devel >= 0.24
+BuildRequires: satyr-devel >= 0.38
 BuildRequires: glib2-devel >= %{glib_ver}
 BuildRequires: git-core
 
@@ -56,7 +52,7 @@ BuildRequires: augeas-devel
 BuildRequires: augeas
 BuildRequires: libarchive-devel
 Requires: libreport-filesystem = %{version}-%{release}
-Requires: satyr%{?_isa} >= 0.24
+Requires: satyr%{?_isa} >= 0.38
 Requires: glib2%{?_isa} >= %{glib_ver}
 Requires: libarchive%{?_isa}
 
@@ -656,6 +652,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Mon Jan 17 2022 Matěj Grabovský <mgrabovs@redhat.com> - 2.16.0-1
+- Bump satyr dependency to 0.38
+- Bump libreport library revision to 2:1:0
+- Drop build-time dependency on libproxy-devel
+- Drop last reference to global_uuid file
+- Don't use deprecated assertEquals() in tests
+- Add DEBUGINFOD_URLS environment variable to ignored_words
+- rhbz: Retry XML-RPC calls when uploading attachments
+- rhbz: Be a little bit more defensive when working with subcomponents
+- Update translations
+
 * Thu Jan 13 2022 Matěj Grabovský <mgrabovs@redhat.com> - 2.15.2-11
 - Backport patch for building with Python 3.11
   (https://bugzilla.redhat.com/show_bug.cgi?id=2019402)
diff --git a/sources b/sources
index c9ba4ce..c288796 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libreport-2.15.2.tar.gz) = c98003325fa70d674177c9f602a7f121815a9675701ee780ad8908ed69862f2c69be65c7483fd3f017ba299dda51ba304f0908c771c9d97cb5bba057e3a9c5dc
+SHA512 (libreport-2.16.0.tar.gz) = cbb456bb63b92a255fecb87191160c2e515b4434cbaaa9404fb69f4f78421fe98c4057969f4b6b99e1b52e815d83c483bdbbe606a4bd2e34cf5268769e7bd40f