diff --git a/.gitignore b/.gitignore index 4292ec0..c327154 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pyhoca-gui-0.5.0.2.tar.gz /pyhoca-gui-0.5.0.3.tar.gz /pyhoca-gui-0.5.0.4.tar.gz +/pyhoca-gui-0.5.0.5.tar.gz diff --git a/pyhoca-gui-notify.patch b/pyhoca-gui-notify.patch deleted file mode 100644 index b015ca8..0000000 --- a/pyhoca-gui-notify.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py -index bc49028..85f0d52 100644 ---- a/pyhoca/wxgui/notify.py -+++ b/pyhoca/wxgui/notify.py -@@ -22,7 +22,7 @@ import wx - from x2go import X2GOCLIENT_OS - from x2go import log - if X2GOCLIENT_OS in ('Linux', 'Mac'): -- import pynotify -+ from gi.repository import Notify - import exceptions - import basepath - -@@ -52,7 +52,7 @@ class libnotify_NotifierPopup(object): - self._PyHocaGUI = _PyHocaGUI - self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger - -- if not pynotify.init("PyHocaGUI"): -+ if not Notify.init("PyHocaGUI"): - raise NotSupportedException - - def prepare(self, context, title=None, text=None, icon=None, timeout=None): -@@ -132,8 +132,8 @@ class libnotify_NotifierPopup(object): - - try: - if not self._PyHocaGUI.disable_notifications and title and text: -- n = pynotify.Notification(title, text, icon) -- n.set_urgency(pynotify.URGENCY_NORMAL) -+ n = Notify.Notification.new(title, text, icon) -+ n.set_urgency(Notify.Urgency.NORMAL) - n.set_timeout(timeout) - n.show() - except: diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec index d6cb9c9..427cbd3 100644 --- a/pyhoca-gui.spec +++ b/pyhoca-gui.spec @@ -1,16 +1,12 @@ Name: pyhoca-gui -Version: 0.5.0.4 -Release: 3%{?dist} +Version: 0.5.0.5 +Release: 1%{?dist} Summary: Graphical X2Go client written in (wx)Python Group: Applications/Communications License: AGPLv3+ URL: http://www.x2go.org/ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz -# Use pygobject3 libnotify bindings with wxPython 3.0 -# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=769 -# https://bugzilla.redhat.com/show_bug.cgi?id=1225142 -Patch0: pyhoca-gui-notify.patch BuildArch: noarch BuildRequires: python2-devel @@ -51,9 +47,6 @@ notification area and allows multiple X2Go session handling. %prep %setup -q -%if 0%{?fedora} >= 22 -%patch0 -p1 -b .notify -%endif %build @@ -83,7 +76,8 @@ fi %files -f PyHoca-GUI.lang -%doc COPYING README TODO +%license COPYING +%doc README TODO %{_bindir}/%{name} %{python_sitelib}/* %{_datadir}/applications/%{name}.desktop @@ -94,6 +88,10 @@ fi %changelog +* Thu Jan 28 2016 Orion Poplawski - 0.5.0.5-1 +- Update to 0.5.0.5 +- Drop notify patch fixed upstream + * Thu Jun 18 2015 Fedora Release Engineering - 0.5.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 4be2a56..8c1cf8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a195c393a0aecbf9f7fb15732448194 pyhoca-gui-0.5.0.4.tar.gz +d372c3711bb9bead71f6c43e460a9cfd pyhoca-gui-0.5.0.5.tar.gz