From 5a6358a08f8be69e54eeb0487abe05a5af50d4cd Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Apr 12 2017 08:08:34 +0000 Subject: Updated to new snapshot obsoleting patches Fixed dependency on libyui-mga-ncurses --- diff --git a/dnfdragora-1.0.0-fix_recursion_error.patch b/dnfdragora-1.0.0-fix_recursion_error.patch deleted file mode 100644 index 98f3159..0000000 --- a/dnfdragora-1.0.0-fix_recursion_error.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2346c64bd612ce9fe501895b079f71a7fe469711 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Tue, 11 Apr 2017 14:48:12 +0200 -Subject: [PATCH] Fix from anaselli: `RecursionError: maximum recursion depth - exceeded` - ---- - dnfdragora/progress_ui.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/dnfdragora/progress_ui.py b/dnfdragora/progress_ui.py -index 3096142..9840862 100644 ---- a/dnfdragora/progress_ui.py -+++ b/dnfdragora/progress_ui.py -@@ -74,7 +74,10 @@ def info_sub(self, text) : - def set_progress(self, frac, label=None) : - if label is not None: - self.progressbar.setLabel(label) -- self.progressbar.setValue(int(100*frac)) -+ val = self.progressbar.value() -+ newval = int(100*frac) -+ if (val != newval) : -+ self.progressbar.setValue(newval) - #self.__flush() - - def reset_all(self) : diff --git a/dnfdragora.spec b/dnfdragora.spec index bf5c39b..a2d9336 100644 --- a/dnfdragora.spec +++ b/dnfdragora.spec @@ -2,7 +2,7 @@ %global relbuild 0 %if !0%{?relbuild} -%global commit 60988165f84c595a5ac3aa81808f3f569bcb92b8 +%global commit 3662635626599923d196e8b8a28fe8ec4510a17a %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitdate 20170411 %global git_ver -git%{gitdate}.%{shortcommit} @@ -14,7 +14,7 @@ Name: dnfdragora Version: 1.0.0 -Release: 18%{?git_rel}%{?dist} +Release: 19%{?git_rel}%{?dist} Summary: DNF package-manager based on libYui abstraction License: GPLv3+ @@ -25,8 +25,6 @@ Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{version}%{?git_ver}.tar.gz %endif # 0%%{?relbuild} -Patch0: %{url}/pull/31.patch#/%{name}-1.0.0-fix_recursion_error.patch - BuildArch: noarch BuildRequires: cmake >= 3.4.0 @@ -43,7 +41,7 @@ BuildRequires: python3-yui Requires: dnf >= 1.0.9 Requires: filesystem Requires: hicolor-icon-theme -Requires: yui-mga-tui +Requires: libyui-mga-ncurses Requires: python3-dnfdaemon Requires: python3-PyYAML Requires: python3-yui >= 1.1.1-10 @@ -152,6 +150,10 @@ fi %changelog +* Wed Apr 12 2017 Björn Esser - 1.0.0-19.git20170411.3662635 +- Updated to new snapshot obsoleting patches +- Fixed dependency on libyui-mga-ncurses + * Tue Apr 11 2017 Björn Esser - 1.0.0-18.git20170411.6098816 - Add fix from anaselli: `RecursionError: maximum recursion depth exceeded` (rhbz#1439247, #1436508, #1436451, #1440570, #1440565, #1440174) diff --git a/sources b/sources index b29b3ad..ced0df2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dnfdragora-1.0.0-git20170411.6098816.tar.gz) = 3d23c1bf6583dd82d8a2f365caa6edeb66e21c38a4639f2958fdc6f3766bb364b175fae4cfc55d817a33fcf32e79c74e418c3e3203e1891ebc5aa050411270e2 +SHA512 (dnfdragora-1.0.0-git20170411.3662635.tar.gz) = dcac6fab9cf3e17a13293cd2dfb767fceb23dca91730033f122d1be7608c1ff0dd9363f6078df4dfeeb0e9b90049b5b758a93ff33e72a640c3d6838d663adfa0