diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/0087-plugins-abrt-action-install-debuginfo-Fix-reference.patch b/SOURCES/0087-plugins-abrt-action-install-debuginfo-Fix-reference.patch new file mode 100644 index 0000000..f547e40 --- /dev/null +++ b/SOURCES/0087-plugins-abrt-action-install-debuginfo-Fix-reference.patch @@ -0,0 +1,31 @@ +From aa0d2a4cf3050f82e76fa33f556b17655aebe06b Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Wed, 1 Jul 2020 18:12:41 +0200 +Subject: [PATCH] plugins: abrt-action-install-debuginfo: Fix reference +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +0840adafb280be0bab569e68116e1d3897831f97 fixes the problem in a way that +only works in the upstream code. Here, the code split was not performed +and we don’t have a config object. +--- + src/plugins/abrt-action-install-debuginfo.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/abrt-action-install-debuginfo.in b/src/plugins/abrt-action-install-debuginfo.in +index 3a46233b..b049d18c 100644 +--- a/src/plugins/abrt-action-install-debuginfo.in ++++ b/src/plugins/abrt-action-install-debuginfo.in +@@ -250,7 +250,7 @@ if __name__ == "__main__": + result = downloader.download(missing, download_exact_files=exact_fls) + + # make sure that all downloaded directories are writeable by abrt group +- for root, dirs, files in os.walk(config.cachedirs[0]): ++ for root, dirs, files in os.walk(cachedirs[0]): + for walked_dir in dirs: + os.chmod(os.path.join(root, walked_dir), 0o775) + +-- +2.28.0 + diff --git a/SPECS/abrt.spec b/SPECS/abrt.spec index 3daf0ee..9120e71 100644 --- a/SPECS/abrt.spec +++ b/SPECS/abrt.spec @@ -55,7 +55,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.10.9 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -155,6 +155,8 @@ Patch0083: 0083-remove-old-transition-postscriptlet.patch Patch0084: 0084-make-sure-that-former-caches-are-group-writable.patch Patch0085: 0085-abrt-action-install-debuginfo-Fix-variable-reference.patch Patch0086: 0086-plugins-sosreport_event-Rename-nfsserver-plugin.patch +# git format-patch 2.10.9-19.el8 --no-numbered --start-number=87 --topo-order +Patch0087: 0087-plugins-abrt-action-install-debuginfo-Fix-reference.patch # autogen.sh is need to regenerate all the Makefile files Patch1000: 1000-Add-autogen.sh.patch @@ -1373,8 +1375,8 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog -* Tue Jul 28 2020 CentOS Sources - 2.10.9-19.el8.centos -- Apply debranding changes +* Wed Aug 19 2020 - Ernestas Kulik - 2.10.9-20 +- Something something patch for rhbz#1835388 * Tue Jun 30 2020 - Ernestas Kulik - 2.10.9-19 - Add another patch for #1846272