From a6c35e6a3de320dbb5c0ac21c64dc3ffc685319f Mon Sep 17 00:00:00 2001 From: Coiby Xu Date: Thu, 20 Jan 2022 11:57:35 +0800 Subject: [PATCH] Update to latest git snapshot Note anaconda-34.25.0.25-1.el9 has switched to id-based support for the built-in help in spokes and hubs. Resolves: bz2003131 Signed-off-by: Coiby Xu --- .gitignore | 1 + ...Revert-Remove-the-helpFile-attribute.patch | 25 ------------------- kdump-anaconda-addon.spec | 10 +++++--- sources | 2 +- 4 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 0003-Revert-Remove-the-helpFile-attribute.patch diff --git a/.gitignore b/.gitignore index 8023f57..5c8d7a3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /kdump-anaconda-addon-725e4c4.tar.gz /kdump-anaconda-addon-641a7b7.tar.gz /kdump-anaconda-addon-4c5a91d.tar.gz +/kdump-anaconda-addon-44fe737.tar.gz diff --git a/0003-Revert-Remove-the-helpFile-attribute.patch b/0003-Revert-Remove-the-helpFile-attribute.patch deleted file mode 100644 index 0c10d35..0000000 --- a/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/kdump-anaconda-addon.spec b/kdump-anaconda-addon.spec index 88c6997..b7b584a 100644 --- a/kdump-anaconda-addon.spec +++ b/kdump-anaconda-addon.spec @@ -1,10 +1,10 @@ -%global gitcommit 4c5a91d40bd4ad6080ff831788409abb73a25b3e +%global gitcommit 44fe737bdf3e024d6ebc3e4fd6dea9ca6cf8fe25 %global gitshortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global snapshotdate 20211014 +%global snapshotdate 20220120 Name: kdump-anaconda-addon Version: 006 -Release: 11.%{snapshotdate}git%{gitshortcommit}%{?dist} +Release: 12.%{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,9 @@ Kdump anaconda addon %{_datadir}/icons/hicolor/scalable/apps/kdump.svg %changelog +* 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 diff --git a/sources b/sources index 0895e7c..889e99c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdump-anaconda-addon-4c5a91d.tar.gz) = 8dcf1435daaa2a4c279ab035ee3be08282b8abee3235821da7915bea6370773117ed282c0a305d30280fce2d0bf8c6600e1f1091df616881666e07d0786a0904 +SHA512 (kdump-anaconda-addon-44fe737.tar.gz) = d85d6d71dc547bf0117a3fcce8c689ba365ae710b882d2bb95ad938e136968075655224a9122151c75688cbda135667840ebe3fbc146783eb40870dd4ab0bf9e