[gnome-shell-extensions/f15] - Update to latest git snapshot of the 3.0 branch - Enable apps-menu extension - Spec cleanup
Mohamed ElMorabity
melmorabity at fedoraproject.org
Sun Aug 21 16:45:31 UTC 2011
commit 270d46fc51ec4666b38eacfc6361e676a6332ae2
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Sun Aug 21 18:45:34 2011 +0200
- Update to latest git snapshot of the 3.0 branch
- Enable apps-menu extension
- Spec cleanup
.gitignore | 1 +
gnome-shell-extensions.spec | 345 ++++++++++++++++++++++++++++---------------
sources | 2 +-
3 files changed, 231 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47abe9c..167bde3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/gnome-shell-extensions-b20cba.tar.xz
/gnome-shell-extensions-03660f.tar.xz
/gnome-shell-extensions-g63dd27c.tar.xz
+/gnome-shell-extensions-939994d0.tar.xz
diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index 28f26f8..162bd62 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -1,24 +1,27 @@
-%global commit g63dd27c
+%global commit 939994d0
+%global pkg_prefix gnome-shell-extension
Name: gnome-shell-extensions
Version: 3.0.2
-Release: 1.%{commit}git%{?dist}
+Release: 3.%{commit}git%{?dist}
Summary: Modify and extend GNOME Shell functionality and behavior
Group: User Interface/Desktops
-License: GPLv2+
+License: GPLv2+
URL: http://live.gnome.org/GnomeShell/Extensions
-# using git archive since upstream hasn't created tarballs. Picking up a snapshot from master for a couple of minor but relevant changes
-# git archive --format=tar --prefix=gnome-shell-extensions/ git_commithash | xz > gnome-shell-extensions-<git_commithash_abbr>.tar.xz
+# Using git archive since upstream hasn't created tarballs. Picking up a
+# snapshot from master for a couple of minor but relevant changes
+# $ git clone %{commit} git://git.gnome.org/gnome-shell-extensions
+# $ cd gnome-shell-extensions/
+# $ git archive --format=tar --prefix=gnome-shell-extensions/ %{commit} | xz > ../gnome-shell-extensions-%{commit}.tar.xz
Source0: gnome-shell-extensions-%{commit}.tar.xz
-# since we build from a git checkout
+# Since we build from a git checkout
BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: glib2-devel
# TODO: uncomment when enabling systemMonitor
-#BuildRequires: pkgconfig(libgtop-2.0)
-
+# BuildRequires: pkgconfig(libgtop-2.0)
Requires: gnome-shell >= 3.0.1
BuildArch: noarch
@@ -27,132 +30,207 @@ GNOME Shell Extensions is a collection of extensions providing additional
and optional functionality to GNOME Shell.
Enabled extensions:
-
* alternate-tab
* alternative-status-menu
- * dock
- * windowsNavigator
- * user-theme
+ * apps-menu
* auto-move-windows
+ * dock
* drive-menu
- * places-menu
+# TODO: uncomment when enabling gajim
+# * gajim
* native-window-placement
+ * places-menu
# TODO: uncomment when enabling systemMonitor
# * systemMonitor
+ * user-theme
+ * windowsNavigator
+# TODO: uncomment when enabling xrand-indicator
+# * xrand-indicator
+
-%package common
+%package -n %{pkg_prefix}-common
Summary: Files common to GNOME Shell Extensions
Group: User Interface/Desktops
-License: GPLv2+
-%description common
+License: GPLv2+
+Provides: %{name}-common = %{version}-%{release}
+Obsoletes: %{name}-common < %{version}-%{release}
+
+%description -n %{pkg_prefix}-common
GNOME Shell Extensions is a collection of extensions providing additional
and optional functionality to GNOME Shell. Common files and directories
needed by extensions are provided here.
-%package alternate-tab
+
+%package -n %{pkg_prefix}-alternate-tab
Summary: Classic Alt+Tab behavior. Window based instead of app based
Group: User Interface/Desktops
-License: GPLv2+
-Requires: %{name}-common = %{version}-%{release}
+License: GPLv2+
+Provides: %{name}-alternate-tab = %{version}-%{release}
+Obsoletes: %{name}-alternate-tab < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
-%description alternate-tab
+%description -n %{pkg_prefix}-alternate-tab
Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
GNOME Shell groups multiple instances of the same application together.
This extension disables grouping.
-%package alternative-status-menu
+
+%package -n %{pkg_prefix}-alternative-status-menu
Summary: For those who want a power off item visible at all the time
Group: User Interface/Desktops
-License: GPLv2+
-Requires: %{name}-common = %{version}-%{release}
+License: GPLv2+
+Provides: %{name}-alternative-status-menu = %{version}-%{release}
+Obsoletes: %{name}-alternative-status-menu < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
-%description alternative-status-menu
+%description -n %{pkg_prefix}-alternative-status-menu
For those who want a power off item visible at all the time, replaces
GNOME Shell status menu with one featuring separate Suspend and Power Off.
Adds the ability to hibernate as well.
-%package dock
-Summary: Shows a dock-style task switcher permanently
-Group: User Interface/Desktops
-License: GPLv2+
-Requires: %{name}-common = %{version}-%{release}
-
-%description dock
-Shows a dock-style task switcher on the right side of the screen permanently.
-%package windowsNavigator
-Summary: Keyboard selection of windows and work-spaces in overlay mode
+%package -n %{pkg_prefix}-apps-menu
+Summary: Application menu for GNOME Shell
Group: User Interface/Desktops
-License: GPLv2+
-Requires: %{name}-common = %{version}-%{release}
-
-%description windowsNavigator
-Allow keyboard selection of windows and work-spaces in overlay mode in
-GNOME Shell. Switch to overview mode (press the windows or alt+f1 key) and
-press the alt key to show numbers over windows. Press any number to switch
-to the corresponding window.
+License: GPLv2+
+Provides: %{name}-apps-menu = %{version}-%{release}
+Obsoletes: %{name}-apps-menu < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
-%package user-theme
-Summary: Lets the user select a custom theme for the shell
-Group: User Interface/Desktops
-License: GPLv2+
-Requires: %{name}-common = %{version}-%{release}
+%description -n %{pkg_prefix}-apps-menu
+Add a GNOME 2.x style menu for applications.
-%description user-theme
-Lets the user select a custom theme for the Gnome shell. It will allow you to
-apply a style from /.themes/[themeName]/gnome-shell/gnome-shell.css
-%package auto-move-windows
+%package -n %{pkg_prefix}-auto-move-windows
Summary: Assign specific workspaces to applications
Group: User Interface/Desktops
-License: GPLv2+
-Requires: %{name}-common = %{version}-%{release}
+License: GPLv2+
+Provides: %{name}-auto-move-windows = %{version}-%{release}
+Obsoletes: %{name}-auto-move-windows < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
-%description auto-move-windows
+%description -n %{pkg_prefix}-auto-move-windows
Lets you manage your workspaces more easily, assigning a specific workspace to
each application as soon as it creates a window, in a manner configurable with a
GSettings key.
-%package drive-menu
+
+%package -n %{pkg_prefix}-dock
+Summary: Shows a dock-style task switcher permanently
+Group: User Interface/Desktops
+License: GPLv2+
+Provides: %{name}-dock = %{version}-%{release}
+Obsoletes: %{name}-dock < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
+
+%description -n %{pkg_prefix}-dock
+Shows a dock-style task switcher on the right side of the screen permanently.
+
+
+%package -n %{pkg_prefix}-drive-menu
Summary: Disk device manager in the system status area
Group: User Interface/Desktops
-License: GPLv2+
-Requires: %{name}-common = %{version}-%{release}
+License: GPLv2+
+Provides: %{name}-drive-menu = %{version}-%{release}
+Obsoletes: %{name}-drive-menu < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
-%description drive-menu
+%description -n %{pkg_prefix}-drive-menu
Adds a menu in the system status area that tracks removable disk devices
attached and offers to browse them and eject/unmount them.
-%package places-menu
-Summary: Places menu indicator in the system status area
-Group: User Interface/Desktops
-License: GPLv2+
-Requires: %{name}-common = %{version}-%{release}
-%description places-menu
-Adds a menu in the system status area that resembles the Places menu from
-GNOME 2.x
+# TODO: uncomment when enabling gajim
+# %package -n %{pkg_prefix}-gajim
+# Summary: Gajim IM integration
+# Group: User Interface/Desktops
+# License: GPLv2+
+# Provides: %{name}-gajim = %{version}-%{release}
+# Obsoletes: %{name}-gajim < %{version}-%{release}
+# Requires: %{pkg_prefix}-common = %{version}-%{release}
+# Requires: gajim
+
+# %description -n %{pkg_prefix}-gajim
+# Display Gajim incoming chats as notifications in the Shell message tray.
-%package native-window-placement
+
+%package -n %{pkg_prefix}-native-window-placement
Summary: Arrange windows in overview in a more native way
Group: User Interface/Desktops
-License: GPLv2+
-Requires: %{name}-common = %{version}-%{release}
+License: GPLv2+
+Provides: %{name}-native-window-placement = %{version}-%{release}
+Obsoletes: %{name}-native-window-placement < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
-%description native-window-placement
+%description -n %{pkg_prefix}-native-window-placement
This extension employs an algorithm (taken from KDE) for layouting the
thumbnails in the overview that more closely reflects the positions and relative
sizes of the actual windows, instead of using a fixed grid.
+
+%package -n %{pkg_prefix}-places-menu
+Summary: Places menu indicator in the system status area
+Group: User Interface/Desktops
+License: GPLv2+
+Provides: %{name}-places-menu = %{version}-%{release}
+Obsoletes: %{name}-places-menu < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
+
+%description -n %{pkg_prefix}-places-menu
+Adds a menu in the system status area that resembles the Places menu from
+GNOME 2.x
+
+
# TODO: uncomment when enabling systemMonitor
-#%package systemMonitor
-#Summary: Monitor your system status
-#Group: User Interface/Desktops
-#License: GPLv2+
-#Requires: %{name}-common = %{version}-%{release}
+# %package -n %{pkg_prefix}-systemMonitor
+# Summary: Monitor your system status
+# Group: User Interface/Desktops
+# License: GPLv2+
+# Requires: %{pkg_prefix}-common = %{version}-%{release}
+#
+# %description -n %{pkg_prefix}-systemMonitor
+# Monitor your system status
+
+
+%package -n %{pkg_prefix}-user-theme
+Summary: Lets the user select a custom theme for the shell
+Group: User Interface/Desktops
+License: GPLv2+
+Provides: %{name}-user-theme = %{version}-%{release}
+Obsoletes: %{name}-user-theme < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
+
+%description -n %{pkg_prefix}-user-theme
+Lets the user select a custom theme for the Gnome shell. It will allow you to
+apply a style from ~/.themes/[themeName]/gnome-shell/gnome-shell.css
+
+
+%package -n %{pkg_prefix}-windowsNavigator
+Summary: Keyboard selection of windows and work-spaces in overlay mode
+Group: User Interface/Desktops
+License: GPLv2+
+Provides: %{name}-windowsNavigator = %{version}-%{release}
+Obsoletes: %{name}-windowsNavigator < %{version}-%{release}
+Requires: %{pkg_prefix}-common = %{version}-%{release}
+
+%description -n %{pkg_prefix}-windowsNavigator
+Allow keyboard selection of windows and work-spaces in overlay mode in
+GNOME Shell. Switch to overview mode (press the windows or alt+f1 key) and
+press the alt key to show numbers over windows. Press any number to switch
+to the corresponding window.
+
+
+# TODO: uncomment when enabling xrand-indicator
+# %package -n %{pkg_prefix}-xrand-indicator
+# Summary: Status menu for rotating monitors
+# Group: User Interface/Desktops
+# License: GPLv2+
+# Requires: %{pkg_prefix}-common = %{version}-%{release}
#
-#%description systemMonitor
-#Monitor your system status
+# %description -n %{pkg_prefix}-xrand-indicator
+# Add a systems status menu for rotating monitors (overrides what is currently
+# provided by gnome-settings-daemon)
+
%prep
%setup -q -n gnome-shell-extensions
@@ -160,109 +238,144 @@ sizes of the actual windows, instead of using a fixed grid.
# Main.panel._userMenu renamed to Main.panel._statusmenu in GS 3.0.1; fix sent
# to the alternative-status-menu extension author
sed -i "s|Main\.panel\._userMenu|Main.panel._statusmenu|g" extensions/alternative-status-menu/extension.js
-# The configure.ac still thinks that 3.0.1 is the newest version; changing it to 3.0 will make it work
-# with any 3.0.x release
+# The configure.ac still thinks that 3.0.1 is the newest version; changing it to
+# 3.0 will make it work with any 3.0.x release
sed -i "s|3.0.1|3.0|g" configure.ac
+
%build
# since we build from a git checkout
[ -x autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
# TODO: once libgtop2 >= 2.28.4 is available, enable systemMonitor extension
# TODO: once gjs >= 0.7.15 is available, enable xrand-indicator extension
-%configure --enable-extensions="alternate-tab alternative-status-menu dock windowsNavigator user-theme auto-move-windows drive-menu places-menu native-window-placement"
+# TODO: once gajim >= 0.1.14 is available, enable gajim extension
+%configure --enable-extensions="alternate-tab alternative-status-menu apps-menu auto-move-windows dock drive-menu native-window-placement places-menu user-theme windowsNavigator"
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
-%files common -f %{name}.lang
+
+%files -n %{pkg_prefix}-common -f %{name}.lang
%defattr(-,root,root,-)
%doc README
%dir %{_datadir}/gnome-shell/extensions/
-%files alternate-tab
+
+%files -n %{pkg_prefix}-alternate-tab
%defattr(-,root,root,-)
%{_datadir}/gnome-shell/extensions/alternate-tab*
-%files alternative-status-menu
+
+%files -n %{pkg_prefix}-alternative-status-menu
%defattr(-,root,root,-)
%{_datadir}/gnome-shell/extensions/alternative-status-menu*
-%files dock
-%defattr(-,root,root,-)
-%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.dock.gschema.xml
-%{_datadir}/gnome-shell/extensions/dock*
-%files windowsNavigator
+%files -n %{pkg_prefix}-apps-menu
%defattr(-,root,root,-)
-%{_datadir}/gnome-shell/extensions/windowsNavigator*
+%{_datadir}/gnome-shell/extensions/apps-menu*
-%files user-theme
-%defattr(-,root,root,-)
-%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml
-%{_datadir}/gnome-shell/extensions/user-theme*
-%files auto-move-windows
+%files -n %{pkg_prefix}-auto-move-windows
%defattr(-,root,root,-)
%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
%{_datadir}/gnome-shell/extensions/auto-move-windows*
-%files drive-menu
+
+%files -n %{pkg_prefix}-dock
+%defattr(-,root,root,-)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.dock.gschema.xml
+%{_datadir}/gnome-shell/extensions/dock*
+
+
+%files -n %{pkg_prefix}-drive-menu
%defattr(-,root,root,-)
%{_datadir}/gnome-shell/extensions/drive-menu*
-%files places-menu
+
+# TODO: uncomment when enabling gajim
+# %files -n %{pkg_prefix}-gajim
+# %defattr(-,root,root,-)
+# %{_datadir}/gnome-shell/extensions/gajim*
+
+
+%files -n %{pkg_prefix}-native-window-placement
%defattr(-,root,root,-)
-%{_datadir}/gnome-shell/extensions/places-menu*
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
+%{_datadir}/gnome-shell/extensions/native-window-placement*
+
-%files places-menu
+%files -n %{pkg_prefix}-places-menu
%defattr(-,root,root,-)
%{_datadir}/gnome-shell/extensions/places-menu*
-%files auto-move-windows
+
+# TODO: uncomment when enabling systemMonitor
+# %files -n %{pkg_prefix}-systemMonitor
+# %defattr(-,root,root,-)
+# %{_datadir}/gnome-shell/extensions/systemMonitor*
+
+
+%files -n %{pkg_prefix}-user-theme
%defattr(-,root,root,-)
-%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
-%{_datadir}/gnome-shell/extensions/auto-move-windows*
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml
+%{_datadir}/gnome-shell/extensions/user-theme*
+
-%files native-window-placement
+%files -n %{pkg_prefix}-windowsNavigator
%defattr(-,root,root,-)
-%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
-%{_datadir}/gnome-shell/extensions/native-window-placement*
+%{_datadir}/gnome-shell/extensions/windowsNavigator*
-# TODO: uncomment when enabling systemMonitor
-#%files systemMonitor
-#%defattr(-,root,root,-)
-#%{_datadir}/gnome-shell/extensions/systemMonitor*
-%posttrans user-theme
+# TODO: uncomment when enabling xrand-indicator
+# %files -n %{pkg_prefix}-xrand-indicator
+# %defattr(-,root,root,-)
+# %{_datadir}/gnome-shell/extensions/xrand-indicator*
+
+
+%posttrans -n %{pkg_prefix}-auto-move-windows
glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
-%postun user-theme
+%postun -n %{pkg_prefix}-auto-move-windows
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-%posttrans auto-move-windows
+
+%posttrans -n %{pkg_prefix}-dock
glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
-%postun auto-move-windows
+%postun -n %{pkg_prefix}-dock
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-%posttrans native-window-placement
+
+%posttrans -n %{pkg_prefix}-native-window-placement
glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
-%postun native-window-placement
+%postun -n %{pkg_prefix}-native-window-placement
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-%posttrans dock
+
+%posttrans -n %{pkg_prefix}-user-theme
glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
-%postun dock
+%postun -n %{pkg_prefix}-user-theme
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
%changelog
+* Sun Aug 21 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.0.2-3.g63dd27cgit
+- Update to latest git snapshot of the 3.0 branch
+- Enable apps-menu extension
+- Spec cleanup
+
+* Sun Aug 21 2011 Michel Salim <salimma at fedoraproject.org> - 3.0.2-2.g63dd27cgit
+- Rename subpackages in line with new guidelines (RHBZ #715367)
+
* Sat May 28 2011 Timur Kristóf <venemo at fedoraproject.org> - 3.0.2-1.g63dd27cgit
- Update to a newer git snapshot
- Fix RHBZ bug #708230
diff --git a/sources b/sources
index 02beabb..041a255 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-976e00599ca3c68aaabdf71adf09a52c gnome-shell-extensions-g63dd27c.tar.xz
+209dd3cf4ecc3f697d716ab492b2e334 gnome-shell-extensions-939994d0.tar.xz
More information about the scm-commits
mailing list