From c2a7037d9b7ad46f05fb98aa0a3e8781a78066c2 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sun, 21 Aug 2011 17:47:21 +0200 Subject: [PATCH] Update to 3.1.4 Enable systemMonitor extension Prepare xrandr-indicator, commenting out since it does not seem to work yet Sort subpackages in alphabetical order --- .gitignore | 5 +- gnome-shell-extensions.spec | 278 ++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 153 insertions(+), 132 deletions(-) diff --git a/.gitignore b/.gitignore index e6bd4fb..5592bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/gnome-shell-extensions-6d56cf.tar.xz -/gnome-shell-extensions-f016b9.tar.xz -/gnome-shell-extensions-03660f.tar.xz -/gnome-shell-extensions-g63dd27c.tar.xz +/gnome-shell-extensions-3.1.4.tar.xz diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 7a7434f..ce5b04e 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -1,26 +1,28 @@ -%global commit g63dd27c +#global commit g63dd27c %global pkg_prefix gnome-shell-extension Name: gnome-shell-extensions -Version: 3.0.2 -Release: 2.%{commit}git%{?dist} +Version: 3.1.4 +Release: 1%{?dist} Summary: Modify and extend GNOME Shell functionality and behavior Group: User Interface/Desktops License: GPLv2+ URL: http://live.gnome.org/GnomeShell/Extensions +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-shell-extensions/3.1/%{name}-%{version}.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 archive --format=tar --prefix=gnome-shell-extensions/ git_commithash | xz > gnome-shell-extensions-.tar.xz -Source0: gnome-shell-extensions-%{commit}.tar.xz +#Source0: gnome-shell-extensions-%{commit}.tar.xz # since we build from a git checkout -BuildRequires: gnome-common +#BuildRequires: gnome-common BuildRequires: intltool BuildRequires: glib2-devel -# TODO: uncomment when enabling systemMonitor -#BuildRequires: pkgconfig(libgtop-2.0) +# TODO: uncomment when enabling xrandr-indicator +# BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(libgtop-2.0) -Requires: gnome-shell >= 3.0.1 +Requires: gnome-shell >= 3.1.0 BuildArch: noarch %description @@ -31,15 +33,16 @@ Enabled extensions: * alternate-tab * alternative-status-menu - * dock - * windowsNavigator - * user-theme * auto-move-windows + * dock * drive-menu - * places-menu * native-window-placement -# TODO: uncomment when enabling systemMonitor -# * systemMonitor + * places-menu + * systemMonitor + * user-theme + * windowsNavigator +# TODO: uncomment when enabling xrandr-indicator +# * xrandr-indicator %package -n %{pkg_prefix}-common Summary: Files common to GNOME Shell Extensions @@ -79,6 +82,19 @@ 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 -n %{pkg_prefix}-auto-move-windows +Summary: Assign specific workspaces to applications +Group: User Interface/Desktops +License: GPLv2+ +Provides: %{name}-auto-move-windows = %{version}-%{release} +Obsoletes: %{name}-auto-move-windows < %{version}-%{release} +Requires: %{pkg_prefix}-common = %{version}-%{release} + +%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 -n %{pkg_prefix}-dock Summary: Shows a dock-style task switcher permanently Group: User Interface/Desktops @@ -90,6 +106,67 @@ 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+ +Provides: %{name}-drive-menu = %{version}-%{release} +Obsoletes: %{name}-drive-menu < %{version}-%{release} +Requires: %{pkg_prefix}-common = %{version}-%{release} + +%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 -n %{pkg_prefix}-native-window-placement +Summary: Arrange windows in overview in a more native way +Group: User Interface/Desktops +License: GPLv2+ +Provides: %{name}-native-window-placement = %{version}-%{release} +Obsoletes: %{name}-native-window-placement < %{version}-%{release} +Requires: %{pkg_prefix}-common = %{version}-%{release} + +%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 + +%package -n %{pkg_prefix}-systemMonitor +Summary: Monitor your system status +Group: User Interface/Desktops +License: GPLv2+ +Requires: %{pkg_prefix}-common = %{version}-%{release} +# should be pulled in by control-center, but in case someone tries for +# a minimalist gnome-shell installation +Requires: libgtop2 + +%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 @@ -104,95 +181,34 @@ 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. -%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}-auto-move-windows -Summary: Assign specific workspaces to applications -Group: User Interface/Desktops -License: GPLv2+ -Provides: %{name}-auto-move-windows = %{version}-%{release} -Obsoletes: %{name}-auto-move-windows < %{version}-%{release} -Requires: %{pkg_prefix}-common = %{version}-%{release} - -%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 -n %{pkg_prefix}-drive-menu -Summary: Disk device manager in the system status area -Group: User Interface/Desktops -License: GPLv2+ -Provides: %{name}-drive-menu = %{version}-%{release} -Obsoletes: %{name}-drive-menu < %{version}-%{release} -Requires: %{pkg_prefix}-common = %{version}-%{release} - -%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 -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 - -%package -n %{pkg_prefix}-native-window-placement -Summary: Arrange windows in overview in a more native way -Group: User Interface/Desktops -License: GPLv2+ -Provides: %{name}-native-window-placement = %{version}-%{release} -Obsoletes: %{name}-native-window-placement < %{version}-%{release} -Requires: %{pkg_prefix}-common = %{version}-%{release} - -%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. - -# TODO: uncomment when enabling systemMonitor -#%package -n %{pkg_prefix}-systemMonitor -#Summary: Monitor your system status +# TODO: uncomment when enabling xrandr-indicator +#%package -n %{pkg_prefix}-xrandr-indicator +#Summary: Monitor status indicator #Group: User Interface/Desktops #License: GPLv2+ #Requires: %{pkg_prefix}-common = %{version}-%{release} # -#%description -n %{pkg_prefix}-systemMonitor -#Monitor your system status +#%description -n %{pkg_prefix}-xrandr-indicator +#This extension adds a systems status menu for rotating monitors +#(overrides what is currently provided by gnome-settings-daemon. %prep -%setup -q -n gnome-shell-extensions +%setup -q # 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 +#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 -sed -i "s|3.0.1|3.0|g" configure.ac +#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 +# [ -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: enable xrandr-indicator extension when: +# - gjs 1.29.16 is supported (upper limit is now 1.29.1) +%configure --enable-extensions="alternate-tab alternative-status-menu auto-move-windows dock drive-menu native-window-placement places-menu systemMonitor user-theme windowsNavigator" make %{?_smp_mflags} %install @@ -208,62 +224,58 @@ make install DESTDIR=$RPM_BUILD_ROOT %files -n %{pkg_prefix}-alternate-tab %defattr(-,root,root,-) +%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.alternate-tab.gschema.xml %{_datadir}/gnome-shell/extensions/alternate-tab* %files -n %{pkg_prefix}-alternative-status-menu %defattr(-,root,root,-) %{_datadir}/gnome-shell/extensions/alternative-status-menu* +%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 -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}-windowsNavigator -%defattr(-,root,root,-) -%{_datadir}/gnome-shell/extensions/windowsNavigator* - -%files -n %{pkg_prefix}-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 -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 -n %{pkg_prefix}-drive-menu %defattr(-,root,root,-) %{_datadir}/gnome-shell/extensions/drive-menu* -%files -n %{pkg_prefix}-places-menu -%defattr(-,root,root,-) -%{_datadir}/gnome-shell/extensions/places-menu* - -%files -n %{pkg_prefix}-places-menu -%defattr(-,root,root,-) -%{_datadir}/gnome-shell/extensions/places-menu* - -%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 -n %{pkg_prefix}-native-window-placement %defattr(-,root,root,-) %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml %{_datadir}/gnome-shell/extensions/native-window-placement* -# TODO: uncomment when enabling systemMonitor -#%files -n %{pkg_prefix}-systemMonitor -#%defattr(-,root,root,-) -#%{_datadir}/gnome-shell/extensions/systemMonitor* +%files -n %{pkg_prefix}-places-menu +%defattr(-,root,root,-) +%{_datadir}/gnome-shell/extensions/places-menu* -%posttrans -n %{pkg_prefix}-user-theme +%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.user-theme.gschema.xml +%{_datadir}/gnome-shell/extensions/user-theme* + +%files -n %{pkg_prefix}-windowsNavigator +%defattr(-,root,root,-) +%{_datadir}/gnome-shell/extensions/windowsNavigator* + +# TODO: uncomment when enabling xrandr-indicator +#%files -n %{pkg_prefix}-xrandr-indicator +#%defattr(-,root,root,-) +#%{_datadir}/gnome-shell/extensions/xrandr-indicator* + +%posttrans -n %{pkg_prefix}-alternate-tab glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || : -%postun -n %{pkg_prefix}-user-theme +%postun -n %{pkg_prefix}-alternate-tab glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %posttrans -n %{pkg_prefix}-auto-move-windows @@ -272,19 +284,31 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || : %postun -n %{pkg_prefix}-auto-move-windows glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -%posttrans -n %{pkg_prefix}-native-window-placement -glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || : - -%postun -n %{pkg_prefix}-native-window-placement -glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - %posttrans -n %{pkg_prefix}-dock glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || : %postun -n %{pkg_prefix}-dock glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +%posttrans -n %{pkg_prefix}-native-window-placement +glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || : + +%postun -n %{pkg_prefix}-native-window-placement +glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + +%posttrans -n %{pkg_prefix}-user-theme +glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || : + +%postun -n %{pkg_prefix}-user-theme +glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + %changelog +* Sun Aug 21 2011 Michel Salim - 3.1.4-1 +- Update to 3.1.4 +- Enable systemMonitor extension +- Prepare xrandr-indicator, commenting out since it does not seem to work yet +- Sort subpackages in alphabetical order + * Sun Aug 21 2011 Michel Salim - 3.0.2-2.g63dd27cgit%{?dist} - Rename subpackages in line with new guidelines (# 715367) diff --git a/sources b/sources index 02beabb..f20b89e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -976e00599ca3c68aaabdf71adf09a52c gnome-shell-extensions-g63dd27c.tar.xz +6c26465a635532b56740e549b032e902 gnome-shell-extensions-3.1.4.tar.xz