Hello community, here is the log from the commit of package fusion-icon for openSUSE:Factory checked in at 2017-05-16 14:33:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fusion-icon (Old) and /work/SRC/openSUSE:Factory/.fusion-icon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fusion-icon" Tue May 16 14:33:56 2017 rev:4 rq:489194 version:0.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/fusion-icon/fusion-icon.changes 2016-05-10 09:27:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fusion-icon.new/fusion-icon.changes 2017-05-16 14:34:02.096873447 +0200 @@ -1,0 +2,9 @@ +Thu Apr 18 23:49:07 UTC 2017 - [email protected] + +- Update to version 0.2.3: + * Fix fail to fallback from GTK+ if dependencies are not met. + * Add Python3 support. + * Use /usr/local as a default prefix path. +- Switch to Python3. + +------------------------------------------------------------------- Old: ---- fusion-icon-0.2.2.tar.xz New: ---- fusion-icon-0.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fusion-icon.spec ++++++ --- /var/tmp/diff_new_pack.squkBW/_old 2017-05-16 14:34:03.032741966 +0200 +++ /var/tmp/diff_new_pack.squkBW/_new 2017-05-16 14:34:03.036741404 +0200 @@ -1,7 +1,7 @@ # # spec file for package fusion-icon # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: fusion-icon -Version: 0.2.2 +Version: 0.2.3 Release: 0 Summary: Tray icon to manage Compiz License: GPL-2.0+ @@ -28,18 +28,18 @@ BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: hicolor-icon-theme -BuildRequires: python +BuildRequires: python3 BuildRequires: update-desktop-files Requires: Mesa-demo-x -Requires: python-compizconfig -Requires: python-gobject -Requires: python-qt5 +Requires: python3-compizconfig +Requires: python3-gobject +Requires: python3-qt5 Requires: xvinfo Recommends: compiz-gnome < 0.9 Suggests: compizconfig-settings-manager < 0.9 BuildArch: noarch %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 -Requires: python-gobject-Gdk +Requires: python3-gobject-Gdk %endif %description @@ -52,15 +52,16 @@ cp -f %{SOURCE1} %{name}.1 %build -python2 setup.py build \ +python3 setup.py build \ --with-qt=5.0 --with-gtk=3.0 %install -python2 setup.py install \ +python3 setup.py install \ --root=%{buildroot} \ --prefix=%{_prefix} -install -Dm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +mv %{buildroot}%{_datadir}/{metainfo,appdata}/ +install -Dpm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %suse_update_desktop_file -r %{name} Utility DesktopUtility %fdupes %{buildroot}%{python_sitelib}/ @@ -80,8 +81,8 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %dir %{_datadir}/appdata/ %{_datadir}/appdata/%{name}.appdata.xml -%{python_sitelib}/FusionIcon/ -%{python_sitelib}/fusion_icon-%{version}-* +%{python3_sitelib}/FusionIcon/ +%{python3_sitelib}/fusion_icon-* %{_mandir}/man?/%{name}.?%{?ext_man} %changelog ++++++ fusion-icon-0.2.2.tar.xz -> fusion-icon-0.2.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/FusionIcon/environment.py new/fusion-icon-0.2.3/FusionIcon/environment.py --- old/fusion-icon-0.2.2/FusionIcon/environment.py 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/FusionIcon/environment.py 2016-06-06 15:17:20.000000000 +0200 @@ -18,7 +18,7 @@ # Author(s): crdlb, nesl247, raveit65 import os -from execute import run +from FusionIcon.execute import run tfp = 'GLX_EXT_texture_from_pixmap' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/FusionIcon/execute.py new/fusion-icon-0.2.3/FusionIcon/execute.py --- old/fusion-icon-0.2.2/FusionIcon/execute.py 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/FusionIcon/execute.py 2016-06-06 15:17:20.000000000 +0200 @@ -50,9 +50,9 @@ elif mode == 'output': signal.signal(signal.SIGCHLD, signal.SIG_DFL) if not env: - output = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=open(os.devnull, 'w')).communicate()[0] + output = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=open(os.devnull, "w"), universal_newlines=True).communicate()[0] else: - output = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=open(os.devnull, 'w'), env=env).communicate()[0] + output = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=open(os.devnull, "w"), universal_newlines=True, env=env).communicate()[0] signal.signal(signal.SIGCHLD, signal.SIG_IGN) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/FusionIcon/interface.py new/fusion-icon-0.2.3/FusionIcon/interface.py --- old/fusion-icon-0.2.2/FusionIcon/interface.py 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/FusionIcon/interface.py 2016-06-06 15:17:20.000000000 +0200 @@ -19,8 +19,8 @@ # Copyright 2007 Christopher Williams <[email protected]> import sys, os -from util import env -import start +from FusionIcon.util import env +from FusionIcon import start interfaces={ 'qt': 'Qt', @@ -65,8 +65,8 @@ else: # use qt for kde and lxqt; gtk for everything else: - if os.getenv('FUSION_ICON_BACKEND') in interfaces: - chosen_interface = os.getenv('FUSION_ICON_BACKEND') + if os.getenv('FUSION_ICON_INTERFACE') in interfaces: + chosen_interface = os.getenv('FUSION_ICON_INTERFACE') elif 'qt' in interfaces and env.desktop in ('kde', 'lxqt'): chosen_interface = 'qt' elif 'gtk' in interfaces: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/FusionIcon/interface_gtk/__init__.py new/fusion-icon-0.2.3/FusionIcon/interface_gtk/__init__.py --- old/fusion-icon-0.2.2/FusionIcon/interface_gtk/__init__.py 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/FusionIcon/interface_gtk/__init__.py 2016-06-06 15:17:20.000000000 +0200 @@ -1,3 +1,3 @@ # -*- python -*- -import main +from FusionIcon.interface_gtk import main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/FusionIcon/interface_gtk/main.py.in new/fusion-icon-0.2.3/FusionIcon/interface_gtk/main.py.in --- old/fusion-icon-0.2.2/FusionIcon/interface_gtk/main.py.in 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/FusionIcon/interface_gtk/main.py.in 2016-06-18 20:44:16.000000000 +0200 @@ -22,8 +22,12 @@ # author: raveit65 import os, time, gi -gi.require_version('Gtk', '@gtkver@') -gi.require_version('AppIndicator@aiver@', '0.1') +try: + gi.require_version('Gtk', '@gtkver@') + gi.require_version('AppIndicator@aiver@', '0.1') +except ValueError as e: + # enable interface fallbacking (works only for ImportError) + raise ImportError(e) from gi.repository import Gtk from gi.repository import AppIndicator@aiver@ as AppIndicator from FusionIcon.start import wms, apps, options, decorators, init diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/FusionIcon/interface_qt/__init__.py new/fusion-icon-0.2.3/FusionIcon/interface_qt/__init__.py --- old/fusion-icon-0.2.2/FusionIcon/interface_qt/__init__.py 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/FusionIcon/interface_qt/__init__.py 2016-06-06 15:17:20.000000000 +0200 @@ -1,3 +1,3 @@ # -*- python -*- -import main +from FusionIcon.interface_qt import main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/FusionIcon/start.py new/fusion-icon-0.2.3/FusionIcon/start.py --- old/fusion-icon-0.2.2/FusionIcon/start.py 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/FusionIcon/start.py 2016-06-06 15:17:20.000000000 +0200 @@ -17,8 +17,8 @@ # Original copyright 2007 Christopher Williams <[email protected]> # Author(s): crdlb, nesl247, raveit65 -from parser import options as parser_options -from util import env, config, apps, options, wms, decorators +from FusionIcon.parser import options as parser_options +from FusionIcon.util import env, config, apps, options, wms, decorators def init(): 'Final start function, should be called once when fusion-icon starts' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/FusionIcon/util.py new/fusion-icon-0.2.3/FusionIcon/util.py --- old/fusion-icon-0.2.2/FusionIcon/util.py 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/FusionIcon/util.py 2016-06-06 15:17:20.000000000 +0200 @@ -19,11 +19,17 @@ # Original copyright 2007 Christopher Williams <[email protected]> # Author(s): crdlb, kozec, raveit65 -import os, compizconfig, ConfigParser, time -import data as _data -from parser import options as parser_options -from environment import env -from execute import run +import os, compizconfig, time +try: + import configparser +except ImportError: + # Python 2.x compatibility. + import ConfigParser as configparser + +import FusionIcon.data as _data +from FusionIcon.parser import options as parser_options +from FusionIcon.environment import env +from FusionIcon.execute import run import subprocess, signal def is_running(app): @@ -347,11 +353,11 @@ if data.options[option][1] not in compiz_optionlist: del self.options[option] -class Configuration(ConfigParser.ConfigParser): +class Configuration(configparser.ConfigParser): def __init__(self, data): - ConfigParser.ConfigParser.__init__(self) + configparser.ConfigParser.__init__(self) self.config_folder = data.config_folder self.config_file = data.config_file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/NEWS new/fusion-icon-0.2.3/NEWS --- old/fusion-icon-0.2.2/NEWS 2016-03-09 19:29:46.000000000 +0100 +++ new/fusion-icon-0.2.3/NEWS 2017-04-19 02:07:16.000000000 +0200 @@ -1,31 +1,40 @@ +Release 0.2.3 (2017-04-18 Sorokin Alexei <[email protected]>) +=============================================================== + +Fix fail to fallback from GTK+ if deps are not met. + +Add Python3 support. + +Use /usr/local as a default prefix path. + Release 0.2.2 (2016-03-09 Sorokin Alexei <[email protected]>) =============================================================== Fix a crash in some cases caused by an error in DE detection. -Acknowledge fusion-icon-panel icon in Qt backend. +Acknowledge fusion-icon-panel icon in Qt frontend. Some minor fixes. Release 0.2.1 (2016-02-21 Sorokin Alexei <[email protected]>) =============================================================== -Add left click action on Qt backend. +Add left click action on Qt frontend. -Fix an icon of Emerald Theme Manager 0.8.12.1 on Gtk backend. +Fix an icon of Emerald Theme Manager 0.8.12.1 on Gtk frontend. Release 0.2.0 (2016-02-12 Sorokin Alexei <[email protected]>) =============================================================== -Restore Qt backend with fixes, menu entry icons and Qt5 support +Restore Qt frontend with fixes, menu entry icons and Qt5 support (Qt version is selectable via --with-qt=4.0/5.0 setup.py arg). Restore Gtk2 support (selectable via --with-gtk=2.0/3.0 setup.py argument). -Gtk backend is the default one, except for KDE and LXQt where -Qt is defaulted instead. Note that one can select desired backend -manually with $FUSION_ICON_BACKEND environment variable. +Gtk frontend is the default one, except for KDE and LXQt where +Qt is defaulted instead. Note that one can select desired frontend +manually with $FUSION_ICON_INTERFACE environment variable. Replace icons for Window Manager and Window Decorator entries with icons from icon themes (were from deprecated GtkStock). @@ -48,9 +57,9 @@ Release 0.1.1 (2015-11-20 Wolfgang Ulbrich <[email protected]>) ================================================================== -Add Gtk3 backend. +Add Gtk3 frontend. -Drop Gtk2 and Qt4 backends. +Drop Gtk2 and Qt4 frontends. If no options are available, do not show the menu. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/PKG-INFO new/fusion-icon-0.2.3/PKG-INFO --- old/fusion-icon-0.2.2/PKG-INFO 2016-03-09 19:32:04.000000000 +0100 +++ new/fusion-icon-0.2.3/PKG-INFO 2017-04-19 02:09:55.000000000 +0200 @@ -1,8 +1,8 @@ Metadata-Version: 1.0 Name: fusion-icon -Version: 0.2.2 +Version: 0.2.3 Summary: User-friendly tray icon for launching and managing Compiz -Home-page: https://github.com/raveit65/fusion-icon +Home-page: https://github.com/compiz-reloaded/fusion-icon Author: Wolfgang Ulbrich Author-email: [email protected] License: UNKNOWN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/VERSION new/fusion-icon-0.2.3/VERSION --- old/fusion-icon-0.2.2/VERSION 2016-03-09 19:29:09.000000000 +0100 +++ new/fusion-icon-0.2.3/VERSION 2017-04-19 02:05:28.000000000 +0200 @@ -1 +1 @@ -0.2.2 +0.2.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/fusion-icon new/fusion-icon-0.2.3/fusion-icon --- old/fusion-icon-0.2.2/fusion-icon 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/fusion-icon 2016-07-11 18:48:02.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # This file is part of Fusion-icon. # Fusion-icon is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import os, sys, time +import os, sys, time, signal try: import FusionIcon @@ -22,6 +22,8 @@ except ImportError: raise SystemExit(' * Error: the "FusionIcon" module is missing. If you did not install fusion-icon to /usr, you may need to add the appropriate site-packages directory to your PYTHONPATH') +signal.signal(signal.SIGINT, signal.SIG_DFL) + # parse command line from FusionIcon.parser import options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/fusion-icon.appdata.xml new/fusion-icon-0.2.3/fusion-icon.appdata.xml --- old/fusion-icon-0.2.2/fusion-icon.appdata.xml 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/fusion-icon.appdata.xml 2016-08-14 16:57:10.000000000 +0200 @@ -11,5 +11,5 @@ manager and/or window decorator. </p> </description> - <url type="homepage">https://github.com/raveit65/fusion-icon</url> + <url type="homepage">https://github.com/compiz-reloaded/fusion-icon</url> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.2/setup.py new/fusion-icon-0.2.3/setup.py --- old/fusion-icon-0.2.2/setup.py 2016-03-09 19:24:55.000000000 +0100 +++ new/fusion-icon-0.2.3/setup.py 2017-04-19 01:58:41.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python import sys, os from stat import * @@ -117,7 +117,7 @@ ('share/icons/hicolor/48x48/apps',['images/48x48/fusion-icon.png']), ('share/icons/hicolor/scalable/apps',['images/scalable/fusion-icon.svg']), ('share/applications',['fusion-icon.desktop']), - ('share/appdata',['fusion-icon.appdata.xml']), + ('share/metainfo',['fusion-icon.appdata.xml']), ] @@ -127,7 +127,7 @@ description='User-friendly tray icon for launching and managing Compiz', author='Wolfgang Ulbrich', author_email='[email protected]', - url='https://github.com/raveit65/fusion-icon', + url='https://github.com/compiz-reloaded/fusion-icon', packages=packages, scripts=['fusion-icon'], data_files=data_files, @@ -156,7 +156,7 @@ i += 1 if not prefix: - prefix = '/usr' + prefix = '/usr/local' gtk_update_icon_cache = '''gtk-update-icon-cache -f -t \ %s/share/icons/hicolor''' % prefix
