From fa1627e00397347bb0d6c258b324578dc66c0249 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 01 2022 10:15:02 +0000 Subject: import kdump-anaconda-addon-006-13.20220128git9603258.el9 --- diff --git a/.gitignore b/.gitignore index a36d956..b2b57c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/kdump-anaconda-addon-4c5a91d.tar.gz +SOURCES/kdump-anaconda-addon-9603258.tar.gz diff --git a/.kdump-anaconda-addon.metadata b/.kdump-anaconda-addon.metadata index a648d1d..3637a74 100644 --- a/.kdump-anaconda-addon.metadata +++ b/.kdump-anaconda-addon.metadata @@ -1 +1 @@ -6e77cc95838067f6dfd4546e6b1fbd708690eaa6 SOURCES/kdump-anaconda-addon-4c5a91d.tar.gz +d0e113dcab835701658bd08d5702d463e51f0256 SOURCES/kdump-anaconda-addon-9603258.tar.gz diff --git a/SOURCES/0003-Revert-Remove-the-helpFile-attribute.patch b/SOURCES/0003-Revert-Remove-the-helpFile-attribute.patch deleted file mode 100644 index 0c10d35..0000000 --- a/SOURCES/0003-Revert-Remove-the-helpFile-attribute.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ecf5928a6ada13cbf06bae7860d176fd82520941 Mon Sep 17 00:00:00 2001 -From: Coiby Xu -Date: Thu, 13 Jan 2022 15:21:27 +0800 -Subject: [PATCH] Revert "Remove the helpFile attribute" - -This reverts commit 3afe9e0c6fa55b10f0ade7cb780387fe4cc498cb. ---- - com_redhat_kdump/gui/spokes/kdump.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/com_redhat_kdump/gui/spokes/kdump.py b/com_redhat_kdump/gui/spokes/kdump.py -index 2b759d6..53daa64 100644 ---- a/com_redhat_kdump/gui/spokes/kdump.py -+++ b/com_redhat_kdump/gui/spokes/kdump.py -@@ -45,6 +45,7 @@ class KdumpSpoke(NormalSpoke): - builderObjects = ["KdumpWindow", "advancedConfigBuffer"] - mainWidgetName = "KdumpWindow" - uiFile = "kdump.glade" -+ helpFile = "KdumpSpoke.xml" - translationDomain = "kdump-anaconda-addon" - - icon = "kdump" --- -2.31.1 - diff --git a/SPECS/kdump-anaconda-addon.spec b/SPECS/kdump-anaconda-addon.spec index 88c6997..e760369 100644 --- a/SPECS/kdump-anaconda-addon.spec +++ b/SPECS/kdump-anaconda-addon.spec @@ -1,10 +1,10 @@ -%global gitcommit 4c5a91d40bd4ad6080ff831788409abb73a25b3e +%global gitcommit 960325885aa3b2b2b0af8343951ea86dcacec27a %global gitshortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global snapshotdate 20211014 +%global snapshotdate 20220128 Name: kdump-anaconda-addon Version: 006 -Release: 11.%{snapshotdate}git%{gitshortcommit}%{?dist} +Release: 13.%{snapshotdate}git%{gitshortcommit}%{?dist} Url: https://github.com/daveyoung/kdump-anaconda-addon License: GPLv2 Summary: Kdump configuration anaconda addon @@ -21,7 +21,6 @@ Source0: https://github.com/daveyoung/kdump-anaconda-addon/archive/%{gitcommit}/ Patch1: 0001.patch Patch2: 0002.patch -Patch3: 0003-Revert-Remove-the-helpFile-attribute.patch %description Kdump anaconda addon @@ -45,6 +44,12 @@ Kdump anaconda addon %{_datadir}/icons/hicolor/scalable/apps/kdump.svg %changelog +* Thu Jan 20 2022 Coiby - 006-1.20220128git9603258 +- Update to latest git snapshot (20220128). Resolves: bz2046612 + +* Thu Jan 20 2022 Coiby - 006-1.20220120git44fe737 +- Update to latest git snapshot (20220120). Resolves: bz2003131 + * Thu Jan 13 2022 Coiby - 006-1.20220113git4c5a91d - Update to latest git snapshot (20220113). Resolves: bz2034491