Fix DNF >= 2.2.0 dbus-signals (rhbz#1440393)

2017-04-10 21:20:38 +02:00
5 changed files with 358 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,8 @@
+/yumex-dnf-4.1.0.tar.gz
+/yumex-dnf-4.1.1.tar.gz
+/yumex-dnf-4.1.2.tar.gz
+/yumex-dnf-4.1.3.tar.gz
+/yumex-dnf-4.1.4.tar.gz
+/yumex-dnf-4.1.5.tar.gz
+/yumex-dnf-4.1.6.tar.gz
+/yumex-dnf-4.3.3.tar.gz
--- a/dead.package
+++ b/dead.package
@ -1 +0,0 @@
-Upstream is dead.  Replaced with dnfdragora.\nSee:  https://pagure.io/fesco/issue/1690#comment-434558
--- a/1
+++ b/1
@ -0,0 +1 @@
+acacdde76207dc13123b1fb42b2f52ff  yumex-dnf-4.3.3.tar.gz
--- a/yumex-dnf-4.3.3_fix_dnf_2_2_0_dbus_signals.patch
+++ b/yumex-dnf-4.3.3_fix_dnf_2_2_0_dbus_signals.patch
@ -0,0 +1,187 @@
+commit 4b44980b23f28d3c8fb970923cfaf9b469bd284c
+Author: Björn Esser <besser82@fedoraproject.org>
+Date:   Mon Apr 10 20:55:47 2017 +0200
+
+    Fix DNF >= 2.2.0 dbus-signals
+
+diff --git a/po/yumex-dnf.pot b/po/yumex-dnf.pot
+index 3f74bc3..24d6d60 100644
+--- a/po/yumex-dnf.pot
+++ b/po/yumex-dnf.pot
+@@ -17,21 +17,21 @@ msgstr ""
+ "Content-Type: text/plain; charset=CHARSET\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+-#: ../src/yumex/__init__.py:112 ../src/yumex/old_init.py:137
+#: ../src/yumex/__init__.py:112
+ msgid "Refreshing Repository Metadata"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:119 ../src/yumex/old_init.py:144
+#: ../src/yumex/__init__.py:119
+ msgid "Could not refresh the DNF cache (root)"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:124 ../src/yumex/old_init.py:149
+#: ../src/yumex/__init__.py:124
+ msgid ""
+ "DNF root backend was not authorized.\n"
+ "Yum Extender will exit"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:129 ../src/yumex/old_init.py:154
+#: ../src/yumex/__init__.py:129
+ msgid ""
+ "DNF is locked by another process.\n"
+ "\n"
+@@ -43,35 +43,32 @@ msgid "Reloading package information..."
+ msgstr ""
+ 
+ #: ../src/yumex/__init__.py:746 ../src/yumex/__init__.py:829
+-#: ../src/yumex/old_init.py:266 ../src/yumex/old_init.py:1047
+ msgid "Searching for dependencies"
+ msgstr ""
+ 
+ #: ../src/yumex/__init__.py:748 ../src/yumex/__init__.py:831
+-#: ../src/yumex/old_init.py:268 ../src/yumex/old_init.py:1049
+ msgid "Dependencies resolved"
+ msgstr ""
+ 
+ #. Ok pressed
+ #: ../src/yumex/__init__.py:762 ../src/yumex/__init__.py:839
+-#: ../src/yumex/dnf_backend.py:206 ../src/yumex/old_init.py:276
+-#: ../src/yumex/old_init.py:1063
+#: ../src/yumex/dnf_backend.py:206
+ msgid "Applying changes to the system"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:787 ../src/yumex/old_init.py:1088
+#: ../src/yumex/__init__.py:787
+ msgid "Error checking package signatures\n"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:793 ../src/yumex/old_init.py:1094
+#: ../src/yumex/__init__.py:793
+ msgid "Downloading error(s)\n"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:799 ../src/yumex/old_init.py:1100
+#: ../src/yumex/__init__.py:799
+ msgid "Error in transaction\n"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:814 ../src/yumex/old_init.py:254
+#: ../src/yumex/__init__.py:814
+ #, python-format
+ msgid "Installing package: %s"
+ msgstr ""
+@@ -81,7 +78,7 @@ msgstr ""
+ msgid "%s was installed successfully"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:820 ../src/yumex/old_init.py:259
+#: ../src/yumex/__init__.py:820
+ #, python-format
+ msgid "Removing package: %s"
+ msgstr ""
+@@ -91,7 +88,7 @@ msgstr ""
+ msgid "%s was removed successfully"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:826 ../src/yumex/old_init.py:264
+#: ../src/yumex/__init__.py:826
+ msgid "Updating all available updates"
+ msgstr ""
+ 
+@@ -100,31 +97,30 @@ msgid "Available updates was applied successfully"
+ msgstr ""
+ 
+ #: ../src/yumex/__init__.py:846 ../src/yumex/__init__.py:896
+-#: ../src/yumex/old_init.py:286 ../src/yumex/old_init.py:1149
+ msgid "Error(s) in search for dependencies"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:862 ../src/yumex/old_init.py:1115
+#: ../src/yumex/__init__.py:862
+ msgid "Preparing system for applying changes"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:873 ../src/yumex/old_init.py:1126
+#: ../src/yumex/__init__.py:873
+ msgid "Can't remove protected package(s)"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:887 ../src/yumex/old_init.py:1140
+#: ../src/yumex/__init__.py:887
+ msgid "No pending actions in queue"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:891 ../src/yumex/old_init.py:1144
+#: ../src/yumex/__init__.py:891
+ msgid "Error(s) in building transaction"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:1013 ../src/yumex/old_init.py:789
+#: ../src/yumex/__init__.py:1013
+ msgid "Adding packages to view"
+ msgstr ""
+ 
+-#: ../src/yumex/__init__.py:1064 ../src/yumex/old_init.py:728
+#: ../src/yumex/__init__.py:1064
+ msgid "Error in undo history transaction"
+ msgstr ""
+ 
+@@ -277,29 +273,6 @@ msgstr ""
+ msgid "Enhancement"
+ msgstr ""
+ 
+-#: ../src/yumex/old_init.py:283
+-msgid "Changes was successfully applied to the system"
+-msgstr ""
+-
+-#: ../src/yumex/old_init.py:1305
+-msgid ""
+-"\n"
+-"\n"
+-"Yum Extender will close"
+-msgstr ""
+-
+-#: ../src/yumex/old_init.py:1307
+-msgid "Error in starting notification icon"
+-msgstr ""
+-
+-#: ../src/yumex/old_init.py:1331
+-msgid "Yum Extender will close"
+-msgstr ""
+-
+-#: ../src/yumex/old_init.py:1333
+-msgid "Error in locking notification icon"
+-msgstr ""
+-
+ #. timeout 10s
+ #: ../src/yumex/updater.py:68
+ msgid "Not Now"
+diff --git a/src/yumex/const.py b/src/yumex/const.py
+index ce8cdb6..b4f7027 100644
+--- a/src/yumex/const.py
+++ b/src/yumex/const.py
+@@ -129,7 +129,8 @@ HISTORY_STATE_LABLES = {
+     'Install': _('Installed packages'),
+     'True-Install': _('Installed packages'),
+     'Dep-Install': _('Installed for dependencies'),
+-    'Reinstall': _('Reinstalled packages')}
+    'Reinstall': _('Reinstalled packages')
+}
+ 
+ 
+ TRANSACTION_RESULT_TYPES = {
+@@ -149,6 +150,9 @@ RPM_ACTIONS = {
+     'obsolete': _("Obsoleting: %s"),
+     'downgrade': _("Downgrading: %s"),
+     'verify': _("Verifying: %s"),
+    'scriptlet': _("Running scriptlet: %s"),
+    'preptrans': _("Preparing transaction: %s"),
+    'posttrans': _("Post-transaction script: %s")
+ }
+ 
+ WIDGETS_INSENSITIVE = ["header_menu", "header_filters",
--- a/yumex-dnf.spec
+++ b/yumex-dnf.spec
@ -0,0 +1,162 @@
+%global appname yumex
+
+Name:     %{appname}-dnf
+Version:  4.3.3
+Release:  4.1%{?dist}
+Summary:  Yum Extender graphical package management tool
+
+Group:    Applications/System
+License:  GPLv2+
+URL:      http://yumex.dk
+Source0:  https://github.com/timlau/yumex-dnf/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+
+Patch0:   %{name}-4.3.3_fix_dnf_2_2_0_dbus_signals.patch
+
+BuildArch: noarch
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: intltool
+BuildRequires: python3-devel
+
+Requires: python3-dnfdaemon >= 0.3.10
+Requires: python3-gobject >= 3.10
+Requires: python3-pyxdg
+Requires: python3-dbus
+Requires: python3-cairo
+Requires: libnotify
+
+%description
+Graphical package tool for maintain packages on the system
+
+
+%prep
+%autosetup -p 1
+
+
+%build
+%make_build
+
+
+%install
+%make_install PYTHON=%{__python3} DATADIR=%{_datadir}
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-local.desktop
+%find_lang %name
+
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files -f  %{name}.lang
+%doc README.md COPYING
+%{_datadir}/%{name}
+%{_bindir}/%{name}*
+%{python3_sitelib}/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/
+%{_datadir}/appdata/*.xml
+
+
+%changelog
+* Mon Apr 10 2017 Björn Esser <besser82@fedoraproject.org> - 4.3.3-4.1
+- Fix DNF >= 2.2.0 dbus-signals (rhbz#1440393)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 4.3.3-3
+- Rebuild for Python 3.6
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.3-2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+
+* Wed May 11 2016 Tim Lauridsen <timlau@fedoraproject.org> 4.3.3-1
+- bumped release to 4.3.3 (dev)
+
+* Tue Apr 26 2016 Tim Lauridsen <timlau@fedoraproject.org> 4.3.2-1
+- bumped release to 4.3.2 (dev)
+
+* Wed Dec 9 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.3.1-1
+- bumped release to 4.3.1 (dev)
+
+* Tue Dec 1 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.3.0-1
+- bumped release to 4.3.0 (dev)
+
+* Wed Sep 30 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.1.4-1
+- bumped release to 4.1.4
+- need python3-dnfdaemon >= 0.3.10
+
+* Wed May 27 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.1.3-1
+- bumped release to 4.1.3
+- need python3-dnfdaemon >= 0.3.9
+
+* Sun Apr 26 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.1.2-1
+- bumped release to 4.1.2
+- need python3-dnfdaemon >= 0.3.8
+
+* Sun Apr 26 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.1.1-1
+- bumped release to 4.1.1
+
+* Thu Apr 16 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.1.0-2
+- require python3-dnfdaemon >= 0.3.6
+
+* Sun Apr 12 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.1.0-1
+- bumped release to 4.1.0
+
+* Sat Apr 11 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.0.10-3
+- fixed changelog versioning
+
+* Thu Apr 9 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.0.10-1
+- bumped release to 4.0.10
+
+* Tue Apr 7 2015 Tim Lauridsen <timlau@fedoraproject.org> 4.0.9-1
+- bumped release to 4.0.9
+
+* Tue Oct 21 2014 Tim Lauridsen <timlau@fedoraproject.org> 4.0.8-1
+- bumped release to 4.0.8
+- require python3-dnfdaemon >= 0.3.3
+
+* Sun Sep 21 2014 Tim Lauridsen <timlau@fedoraproject.org> 4.0.7-1
+- bumped release to 4.0.7
+
+* Tue Sep 02 2014 Tim Lauridsen <timlau@fedoraproject.org> 4.0.6-1
+- bumped release to 4.0.6
+
+* Fri Jun 06 2014 Tim Lauridsen <timlau@fedoraproject.org> 4.0.5-1
+- bumped release to 4.0.5
+- Requires: python3-dnfdaemon-client >= 0.2.2
+
+* Fri May 09 2014 Tim Lauridsen <timlau@fedoraproject.org> 4.0.4-1
+- bumped release to 4.0.4
+- Requires: python3-dnfdaemon-client >= 0.2.0
+
+* Sat May 03 2014 Tim Lauridsen <timlau@fedoraproject.org> 4.0.3-1
+- bumped release to 4.0.3
+- Requires: python3-dnfdaemon >= 0.1.5
+
+* Tue Apr 01 2014 Tim Lauridsen <timlau@fedoraproject.org> 4.0.2-1
+- bumped release to 4.0.2
+- Requires: python3-dnfdaemon >= 0.1.4
+
+* Sat Mar 29 2014 Tim Lauridsen <timlau@fedoraproject.org> 4.0.1-1
+- bumped release to 4.0.1
+
+* Sun Sep 15 2013 Tim Lauridsen <timlau@fedoraproject.org> 3.99.1-1
+- Initial rpm build
+
				`@ -1 +0,0 @@`
				`Upstream is dead. Replaced with dnfdragora.\nSee: https://pagure.io/fesco/issue/1690#comment-434558`
				`@ -0,0 +1 @@`
				`acacdde76207dc13123b1fb42b2f52ff yumex-dnf-4.3.3.tar.gz`