From 77e6c047b023164d6b856134051afaa93c41ed82 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Oct 08 2020 10:08:10 +0000 Subject: Backport fix from upstream to fix dnfdragora-updater (#1886178) --- diff --git a/0001-Fix-issue-168.patch b/0001-Fix-issue-168.patch new file mode 100644 index 0000000..b1a8706 --- /dev/null +++ b/0001-Fix-issue-168.patch @@ -0,0 +1,37 @@ +From acaa41e511c3ce026a9123fe494bd017cbfb99db Mon Sep 17 00:00:00 2001 +From: Angelo Naselli +Date: Tue, 6 Oct 2020 21:21:02 +0200 +Subject: [PATCH] Fix issue #168 + +--- + Changes | 1 + + dnfdragora/updater.py | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/Changes b/Changes +index 954b6d6..2c9d5c2 100644 +--- a/Changes ++++ b/Changes +@@ -1,5 +1,6 @@ + 2020-XX-YY v. 2.1.t + --------------------- ++- Fix issue #168 + - Managed line feed into descriptions see https://bugs.mageia.org/show_bug.cgi?id=27274 + - Added an user preference to consider upgrades as updates (issue #163) + +diff --git a/dnfdragora/updater.py b/dnfdragora/updater.py +index aa3763c..1d0bd35 100644 +--- a/dnfdragora/updater.py ++++ b/dnfdragora/updater.py +@@ -94,6 +94,8 @@ class Updater: + logger.error("Cannot open theme icon using default one %s"%(icon_path)) + self.__icon = Image.open(icon_path) + ++ # resetting icon_path to default value ++ icon_path = '/usr/share/dnfdragora/images/' + if 'icon-path' in options.keys() : + icon_path = options['icon-path'] + if icon_path.endswith('/'): +-- +2.28.0 + diff --git a/dnfdragora.spec b/dnfdragora.spec index 4034f93..19bb2ab 100644 --- a/dnfdragora.spec +++ b/dnfdragora.spec @@ -3,13 +3,18 @@ Name: dnfdragora Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DNF package-manager based on libYui abstraction License: GPLv3+ URL: https://github.com/manatools/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# Backports from upstream +## Fix path to icons that prevents dnfdragora-updater from working (rhbz#1886178) +## From: https://github.com/manatools/dnfdragora/commit/acaa41e511c3ce026a9123fe494bd017cbfb99db +Patch0001: 0001-Fix-issue-168.patch + BuildArch: noarch BuildRequires: cmake >= 3.4.0 @@ -128,6 +133,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Oct 08 2020 Neal Gompa - 2.1.0-2 +- Backport fix from upstream to fix dnfdragora-updater (#1886178) + * Mon Oct 05 2020 Neal Gompa - 2.1.0-1 - Update to 2.1.0 (#1876299)