[gnome-tweak-tool] - Fix extension update checks - Fix RHBZ #1017801

[Mohamed ElMorabity]

commit 37843aff9c6d4899a842a2b7f4bd6a51e04c030f
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Sat Oct 19 23:56:15 2013 +0200

    - Fix extension update checks
    - Fix RHBZ #1017801

 ...-tweak-tool-3.10.0-fix_extensions_updates.patch |   48 ++++++++++++++++++++
 ...eak-tool-3.10.0-fix_icon_themes_detection.patch |   30 ++++++++++++
 gnome-tweak-tool.spec                              |   13 +++++-
 3 files changed, 90 insertions(+), 1 deletions(-)
---
diff --git a/gnome-tweak-tool-3.10.0-fix_extensions_updates.patch b/gnome-tweak-tool-3.10.0-fix_extensions_updates.patch
new file mode 100644
index 0000000..9172926
--- /dev/null
+++ b/gnome-tweak-tool-3.10.0-fix_extensions_updates.patch
@@ -0,0 +1,48 @@
+From 43eda460642ea5d7a5a899a794d752e15bd1dfe1 Mon Sep 17 00:00:00 2001
+From: John Stowers <john.stowers at gmail.com>
+Date: Sat, 05 Oct 2013 18:28:50 +0000
+Subject: fix extension update checks for 3.10
+
+---
+diff --git a/gtweak/tweaks/tweak_group_shell_extensions.py b/gtweak/tweaks/tweak_group_shell_extensions.py
+index 237917d..58018ce 100644
+--- a/gtweak/tweaks/tweak_group_shell_extensions.py
++++ b/gtweak/tweaks/tweak_group_shell_extensions.py
+@@ -18,6 +18,17 @@ from gtweak.utils import DisableExtension
+ 
+ def N_(x): return x
+ 
++def _fix_shell_version_for_ego(version):
++    #extensions.gnome.org uses a weird versioning system,
++    #3.10.0 is 3.10, 3.10.0.x (x is ignored)
++    #drop the pico? release
++    version = '.'.join(version.split('.')[0:3])
++    if version[-1] == '0':
++        #if it is .0, drop that too
++        return '.'.join(version.split('.')[0:2])
++    else:
++        return version
++
+ class _ShellExtensionTweak(Gtk.ListBoxRow, Tweak):
+ 
+     def __init__(self, shell, ext, **options):
+@@ -305,14 +316,15 @@ class ShellExtensionTweakGroup(ListBoxTweakGroup):
+         if uuid == extension["uuid"]:
+             resp = resp['shell_version_map']
+             shell = GnomeShellFactory().get_shell()
+-            version = shell.version[0:3]
++            version = _fix_shell_version_for_ego(shell.version)
+             try:
+                 resp = resp[version]
+                 if int(resp["version"]) > extension["version"]:
+                     widget.add_update_button(uuid)
+ 
+             except KeyError:
+-                print "Older/Unknown Version"
++                logging.info("e.g.o no updates for %s (shell version %s extension version %s)" % (
++                             uuid,version,extension["version"]))
+ 
+     def _list_header_func(self, row, before, user_data):
+         if before and not row.get_header():
+--
+cgit v0.9.2
diff --git a/gnome-tweak-tool-3.10.0-fix_icon_themes_detection.patch b/gnome-tweak-tool-3.10.0-fix_icon_themes_detection.patch
new file mode 100644
index 0000000..73dfa1d
--- /dev/null
+++ b/gnome-tweak-tool-3.10.0-fix_icon_themes_detection.patch
@@ -0,0 +1,30 @@
+From acb5cfcbbb2b0b3c5f31426e0fbaa0966b52aca6 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Wed, 16 Oct 2013 10:43:26 -0400
+Subject: [PATCH] Fix detection of icon themes
+
+GNOME can only deal with icon themes that have an index.theme file
+in their toplevel. It doesn't have any problem per se with a
+cursors/ directory living in the same location. Fix up the
+check to match this.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=710275
+---
+ gtweak/tweaks/tweak_group_interface.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index 375e449..6103432 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
+@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
+                  os.path.join(os.path.expanduser("~"), ".icons"))
+         valid = walk_directories(dirs, lambda d:
+                     os.path.isdir(d) and \
+-                        not os.path.exists(os.path.join(d, "cursors")))
++			os.path.exists(os.path.join(d, "index.theme")))
+         return valid
+ 
+ class CursorThemeSwitcher(GSettingsComboTweak):
+-- 
+1.8.3.1
\ No newline at end of file
diff --git a/gnome-tweak-tool.spec b/gnome-tweak-tool.spec
index d67adca..337bf5a 100644
--- a/gnome-tweak-tool.spec
+++ b/gnome-tweak-tool.spec
@@ -2,12 +2,17 @@
 
 Name:           gnome-tweak-tool
 Version:        3.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A tool to customize advanced GNOME 3 options
 
 License:        GPLv3
 URL:            http://live.gnome.org/GnomeTweakTool
 Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/%{major_version}/gnome-tweak-tool-%{version}.tar.xz
+# Fix extension update checks (see
+# https://git.gnome.org/browse/gnome-tweak-tool/commit/?id=43eda46)
+Patch0:         %{name}-3.10.0-fix_extensions_updates.patch
+# Fix RHBZ #1017801 (detection of icon themes, see also GNOME BZ #710275)
+Patch1:         %{name}-3.10.0-fix_icon_themes_detection.patch
 
 BuildArch:      noarch
 BuildRequires:  intltool
@@ -40,6 +45,8 @@ Features:
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix_extensions_updates
+%patch1 -p1 -b .fix_icon_themes_detection
 
 
 %build
@@ -85,6 +92,10 @@ fi
 
 
 %changelog
+* Sat Oct 19 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.10.0-2
+- Fix extension update checks
+- Fix RHBZ #1017801
+
 * Wed Sep 25 2013 Mohamed El Morabity - 3.10.0-1
 - Update to 3.10.0