From a6aedd2d696959d807c841b1196a94ca5f2ebc54 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 12 Jan 2021 14:47:28 +0000 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#2dbc51d12b7ebea8915e013908ae15a95b2b1b8c --- .gitignore | 1 + 0001-spec-Use-autoreconf-in-build.patch | 38 +++++++++++++++++++++++++ satyr.spec | 11 ++++++- sources | 2 +- 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 0001-spec-Use-autoreconf-in-build.patch diff --git a/.gitignore b/.gitignore index e5d1daa..aa91b64 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /satyr-0.33.tar.gz /satyr-0.34.tar.gz /satyr-0.35.tar.gz +/satyr-0.36.tar.gz diff --git a/0001-spec-Use-autoreconf-in-build.patch b/0001-spec-Use-autoreconf-in-build.patch new file mode 100644 index 0000000..77b30e9 --- /dev/null +++ b/0001-spec-Use-autoreconf-in-build.patch @@ -0,0 +1,38 @@ +From 53159764cbdd4f5dc02bcabbc7e775b9c5cc1a96 Mon Sep 17 00:00:00 2001 +From: Michal Fabik +Date: Mon, 11 Jan 2021 12:06:49 +0100 +Subject: [PATCH] spec: Use autoreconf in %build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This way, when stuff is fixed in automake, the source tarball does not +need to be re-generated in upstream to use the fix. + +Resolves rhbz#1898063 + +Patch contributed by Miro HronĨok +Lifted from e17dd1d8 in libreport +Signed-off-by: Michal Fabik +--- + Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 5aa296e..bebbc30 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -10,7 +10,9 @@ satyr_SOURCES = satyr.c + satyr_LDADD = lib/libsatyr.la + + man_MANS = satyr.1 +-EXTRA_DIST = satyr.1.in ++EXTRA_DIST = \ ++ satyr.1.in \ ++ satyr-version + + dist_doc_DATA = README.md + +-- +2.29.2 + diff --git a/satyr.spec b/satyr.spec index c345186..95fe1bf 100644 --- a/satyr.spec +++ b/satyr.spec @@ -16,7 +16,7 @@ %define glib_ver 2.43.4 Name: satyr -Version: 0.35 +Version: 0.36 Release: 1%{?dist} Summary: Tools to create anonymous, machine-friendly problem reports License: GPLv2+ @@ -77,6 +77,8 @@ Python 3 bindings for %{name}. %setup -q %build +autoreconf + %configure \ %if %{without python3} --without-python3 \ @@ -129,6 +131,13 @@ make check|| { %endif %changelog +* Tue Jan 12 2021 Michal Fabik 0.36-1 +- New upstream version + - Fix builds with python3.10 + +* Mon Jan 11 2021 Michal Fabik - 0.35-2 +- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1898063 + * Tue Dec 01 2020 Michal Fabik 0.35-1 - New upstream version - Fix leaks in koops stacktrace- and report-handling code diff --git a/sources b/sources index 480457e..03983e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (satyr-0.35.tar.gz) = 2a01759b80cfcb2d8ee930610285d8e0727a19c30d9616e9114573b60c0eaba695ff9daa79d8c585f5fb586d5f0865fcd1660a7fde492e1cec04536236cf07ba +SHA512 (satyr-0.36.tar.gz) = 7e019d2711e05fca725df2e9e2bcb92eaee13a0ef96bc6d94cab62b0bf81b733f3d8f207d44e5a1163d13abb5e0d049bc2e327ad2297e89d42e8d21ddb2f56f7