From bf6d27589e92b65a9a275f58ed7eb2dd39721080 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Thu, 20 Jun 2013 16:52:05 -0400 Subject: [PATCH] Update to 3.9.3 - Obsolete default-min-max and static workspaces extensions - Use make_install macro - Fix bogus dates in spec changelog --- .gitignore | 1 + gnome-shell-extensions.spec | 68 ++++++++++++++----------------------- sources | 2 +- 3 files changed, 27 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 68b7180..7ef46f3 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /gnome-shell-extensions-3.8.1.tar.xz /gnome-shell-extensions-3.9.1.tar.xz /gnome-shell-extensions-3.9.2.tar.xz +/gnome-shell-extensions-3.9.3.tar.xz diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 3578246..c746294 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -5,7 +5,7 @@ %global pkg_prefix gnome-shell-extension Name: gnome-shell-extensions -Version: 3.9.2 +Version: 3.9.3 Release: 1%{?dist} Summary: Modify and extend GNOME Shell functionality and behavior @@ -31,12 +31,10 @@ Enabled extensions: * alternative-status-menu * apps-menu * auto-move-windows - * default-min-max * drive-menu * launch-new-instance * native-window-placement * places-menu - * static-workspaces * systemMonitor * user-theme * window-list @@ -65,11 +63,14 @@ Group: User Interface/Desktops License: GPLv2+ Requires: %{pkg_prefix}-alternate-tab = %{version}-%{release} Requires: %{pkg_prefix}-apps-menu = %{version}-%{release} -Requires: %{pkg_prefix}-default-min-max = %{version}-%{release} Requires: %{pkg_prefix}-launch-new-instance = %{version}-%{release} Requires: %{pkg_prefix}-places-menu = %{version}-%{release} -Requires: %{pkg_prefix}-static-workspaces = %{version}-%{release} Requires: %{pkg_prefix}-window-list = %{version}-%{release} + +# Obsolete extensions dropped in favor of schema overrides by upstream +Obsoletes: %{pkg_prefix}-default-min-max < 3.9.3-1 +Obsoletes: %{pkg_prefix}-static-workspaces < 3.9.3-1 + # Obsolete fallback mode components Obsoletes: gnome-applets < 1:3.5.92-5 %global gnome_applet_sensors_obsolete_ver 3.0.0-6 @@ -129,17 +130,6 @@ workspace can be assigned to each application as soon as it creates a window, in a manner configurable with a GSettings key. -%package -n %{pkg_prefix}-default-min-max -Summary: Add minimize and maximize titlebar buttons in GNOME Shell -Group: User Interface/Desktops -License: GPLv2+ -Requires: %{pkg_prefix}-common = %{version}-%{release} - -%description -n %{pkg_prefix}-default-min-max -This GNOME Shell extension adds minimize and maximize buttons to the titlebar by -default. - - %package -n %{pkg_prefix}-drive-menu Summary: Drive status menu for GNOME Shell Group: User Interface/Desktops @@ -186,19 +176,6 @@ This GNOME Shell extension add a system status menu for quickly navigating places in the system. -%package -n %{pkg_prefix}-static-workspaces -Summary: Disable dynamic workspace management in GNOME Shell -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}-static-workspaces -This GNOME Shell extension disables dynamic workspace management. - - %package -n %{pkg_prefix}-systemMonitor Summary: System Monitor for GNOME Shell Group: User Interface/Desktops @@ -278,7 +255,7 @@ make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # Drop useless example extension rm -r $RPM_BUILD_ROOT%{_datadir}/gnome-shell/extensions/example*/ @@ -301,7 +278,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-shell-classi %{_datadir}/gnome-shell/theme/*.svg %{_datadir}/gnome-shell/theme/gnome-classic.css %{_datadir}/xsessions/gnome-classic.desktop - +%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.classic-overrides.gschema.xml %files -n %{pkg_prefix}-alternate-tab %{_datadir}/gnome-shell/extensions/alternate-tab*/ @@ -320,11 +297,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-shell-classi %{_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}-default-min-max -%{_datadir}/gnome-shell/extensions/default-min-max*/ - - %files -n %{pkg_prefix}-drive-menu %{_datadir}/gnome-shell/extensions/drive-menu*/ @@ -342,10 +314,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-shell-classi %{_datadir}/gnome-shell/extensions/places-menu*/ -%files -n %{pkg_prefix}-static-workspaces -%{_datadir}/gnome-shell/extensions/static-workspaces*/ - - %files -n %{pkg_prefix}-systemMonitor %{_datadir}/gnome-shell/extensions/systemMonitor*/ @@ -371,6 +339,14 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-shell-classi %files -n %{pkg_prefix}-xrandr-indicator %{_datadir}/gnome-shell/extensions/xrandr-indicator*/ +%postun -n gnome-classic-session +if [ $1 -eq 0 ]; then + /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas/ &>/dev/null || : +fi + +%posttrans -n gnome-classic-session +/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas/ &>/dev/null || : + %postun -n %{pkg_prefix}-alternative-status-menu if [ $1 -eq 0 ]; then @@ -418,6 +394,12 @@ fi %changelog +* Thu Jun 20 2013 Rahul Sundaram - 3.9.3-1 +- Update to 3.9.3 +- Obsolete default-min-max and static workspaces extensions +- Use make_install macro +- Fix bogus dates in spec changelog + * Tue May 28 2013 Mohamed El Morabity - 3.9.2-1 - Update to 3.9.2 @@ -574,14 +556,14 @@ fi * Mon Apr 11 2011 Mohamed El Morabity - 3.0.0-5.6d56cfgit - Enable auto-move-windows extension -* Sun Apr 11 2011 Rahul Sundaram - 3.0.0-4.6d56cfgit +* Mon Apr 11 2011 Rahul Sundaram - 3.0.0-4.6d56cfgit - Add glib2-devel as build requires -* Sun Apr 11 2011 Rahul Sundaram - 3.0.0-3.6d56cfgit +* Mon Apr 11 2011 Rahul Sundaram - 3.0.0-3.6d56cfgit - Tweak description - Fix typo in configure -* Sun Apr 11 2011 Rahul Sundaram - 3.0.0-2.6d56cfgit +* Mon Apr 11 2011 Rahul Sundaram - 3.0.0-2.6d56cfgit - Added the user-theme extension - Patch from Timur Kristóf diff --git a/sources b/sources index c74f8bd..f7f5fc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93b8d4e0c667fc5f736bf7b004784e63 gnome-shell-extensions-3.9.2.tar.xz +a9a92f06e38bbef1bad14c6602ac151d gnome-shell-extensions-3.9.3.tar.xz