Update to 3.3.90

.gitignore

@@ -3,3 +3,4 @@
 /gnome-shell-extensions-3.2.0.tar.xz
 /gnome-shell-extensions-3.3.2.tar.xz
 /gnome-shell-extensions-3.3.5.tar.xz
+/gnome-shell-extensions-3.3.90.tar.xz

gnome-shell-extensions-3.3.5-GSettings_schemas.patch

@@ -1,72 +0,0 @@
-From a4fac964dced50d0fd80b977e773bb150f5cdd9b Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Fri, 10 Feb 2012 17:15:31 +0000
-Subject: convenience: allow system-wide installation again
-
-Check if necessary files are installed in the extension folder
-(as done by "make zip-file"), and if not, fallback to the standard
-paths.
----
-diff --git a/lib/convenience.js b/lib/convenience.js
-index 6421ef5..74c02fb 100644
---- a/lib/convenience.js
-+++ b/lib/convenience.js
-@@ -3,6 +3,7 @@
- const Gettext = imports.gettext;
- const Gio = imports.gi.Gio;
- 
-+const Config = imports.misc.config;
- const ExtensionUtils = imports.misc.extensionUtils;
- 
- /**
-@@ -17,8 +18,15 @@ function initTranslations(domain) {
- 
-     domain = domain || extension.metadata['gettext-domain'];
- 
--    let localeDir = extension.dir.get_child('locale').get_path();
--    Gettext.bindtextdomain(domain, localeDir);
-+    // check if this extension was built with "make zip-file", and thus
-+    // has the locale files in a subfolder
-+    // otherwise assume that extension has been installed in the
-+    // same prefix as gnome-shell
-+    let localeDir = extension.dir.get_child('locale');
-+    if (localeDir.query_exists(null))
-+        Gettext.bindtextdomain(domain, localeDir.get_path());
-+    else
-+        Gettext.bindtextdomain(domain, Config.LOCALEDIR);
- }
- 
- /**
-@@ -34,11 +42,26 @@ function getSettings(schema) {
- 
-     schema = schema || extension.metadata['settings-schema'];
- 
--    let schemaDir = extension.dir.get_child('schemas').get_path();
--    let schemaSource = Gio.SettingsSchemaSource.new_from_directory(schemaDir,
--                                                                   Gio.SettingsSchemaSource.get_default(),
--                                                                   false);
-+    const GioSSS = Gio.SettingsSchemaSource;
-+
-+    // check if this extension was built with "make zip-file", and thus
-+    // has the schema files in a subfolder
-+    // otherwise assume that extension has been installed in the
-+    // same prefix as gnome-shell (and therefore schemas are available
-+    // in the standard folders)
-+    let schemaDir = extension.dir.get_child('schemas');
-+    let schemaSource;
-+    if (schemaDir.query_exists(null))
-+        schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
-+                                                 GioSSS.get_default(),
-+                                                 false);
-+    else
-+        schemaSource = GioSSS.get_default();
-+
-     let schemaObj = schemaSource.lookup(schema, false);
-+    if (!schemaObj)
-+        throw new Error('Schema ' + schema + ' could not be found for extension '
-+                        + extension.metadata.uuid + '. Please check your installation.');
- 
-     return new Gio.Settings({ settings_schema: schemaObj });
- }
---
-cgit v0.9.0.2

gnome-shell-extensions.spec

@@ -1,8 +1,9 @@
 %global pkg_prefix gnome-shell-extension
 %global major_version 3.3
+%global min_gs_version %{major_version}.90
 
 Name:           gnome-shell-extensions
-Version:        %{major_version}.5
+Version:        %{major_version}.90
 Release:        1%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 
@@ -14,15 +15,13 @@ URL:            http://live.gnome.org/GnomeShell/Extensions
 # $ cd gnome-shell-extensions/
 # $ git archive --format=tar --prefix=%{name}-%{version}/ %{version} | xz > ../%{name}-%{version}.tar.xz
 Source0:        %{name}-%{version}.tar.xz
-# Fix GSettings schemas path search
-Patch0:         %{name}-3.3.5-GSettings_schemas.patch
 
 BuildRequires:  glib2-devel
 BuildRequires:  gnome-common
 BuildRequires:  intltool
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(libgtop-2.0)
-Requires:       gnome-shell >= %{major_version}.5
+Requires:       gnome-shell >= %{min_gs_version}
 BuildArch:      noarch
 
 %description
@@ -51,7 +50,7 @@ Enabled extensions:
 Summary:        Files common to GNOME Shell Extensions
 Group:          User Interface/Desktops
 License:        GPLv2+
-Requires:       gnome-shell >= %{major_version}.5
+Requires:       gnome-shell >= %{min_gs_version}
 Provides:       %{name}-common = %{version}-%{release}
 Obsoletes:      %{name}-common < %{version}-%{release}
 
@@ -242,7 +241,6 @@ This extension adds a systems status menu for rotating monitors
 
 %prep
 %setup -q
-%patch0 -p1 -b .GSettings_schemas
 
 
 %build
@@ -372,6 +370,9 @@ fi
 
 
 %changelog
+* Tue Feb 28 2012 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.3.90-1
+- Update to 3.3.90
+
 * Thu Feb 16 2012 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.3.5-1
 - Update to 3.3.5
 - Spec cleanup

sources

@@ -1 +1 @@
-91dd75db31f6849d849309c234eebdb6  gnome-shell-extensions-3.3.5.tar.xz
+30e2febb9a99de00a663a4c530076a3a  gnome-shell-extensions-3.3.90.tar.xz