Wed Jan 27 14:30:35 UTC 2010

Author: otaylor

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16007

Modified Files:
	metacity.spec 
Removed Files:
	0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch 
	0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch 
	0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch 
	Add-XFCE-Terminal-as-a-terminal.patch 
	cm-selection-timestamp.patch default-theme.patch 
	metacity-2.28-IceCloseConnection.patch 
	metacity-2.28-visual-bell.patch metacity-canberra.patch 
	metacity-dont-do-bad-stuff-on-sigterm.patch 
	metacity-dont-force-bell.patch 
	metacity-option-to-force-fullscreen.patch 
	metacity-struts.patch 
Log Message:
* Wed Jan 27 2010 Owen Taylor <otaylor at redhat.com> - 2.28.1-1
- Update to 2.28.1, remove 7 patches now applied upstream



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210

--- metacity.spec	3 Jan 2010 16:32:56 -0000	1.209
+++ metacity.spec	27 Jan 2010 14:30:35 -0000	1.210
@@ -2,8 +2,8 @@
 
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.28.0
-Release: 15%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -12,12 +12,6 @@ Patch4: stop-spamming-xsession-errors.pa
 Patch5: dnd-keynav.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=588119
 Patch6: Should-set-RestartStyleHint-to-RestartIfRunning-when.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=593355
-Patch7: 0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=593356
-Patch8: 0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=593358
-Patch9: 0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=336750
 Patch10: screenshot-forkbomb.patch
 
@@ -25,17 +19,12 @@ Patch10: screenshot-forkbomb.patch
 Patch11: workspaces.patch
 Patch12: fresh-tooltips.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=600864
-# https://bugzilla.redhat.com/show_bug.cgi?id=533239
-Patch13: metacity-dont-do-bad-stuff-on-sigterm.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=567528
 Patch14: Allow-explicit-raises-from-same-client-not-just-sa.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=445447
 Patch15: Allow-applications-to-raise-windows-when-raise_on_cl.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=598995
 Patch16: Dont-focus-ancestor-window-on-a-different-workspac.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=599262
-Patch17: Add-XFCE-Terminal-as-a-terminal.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599097
 Patch18: For-mouse-and-sloppy-focus-return-to-mouse-mode-on.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599248
@@ -44,16 +33,10 @@ Patch19: Add-nofocuswindows-preference-t
 Patch20: Add-a-newwindowsalwaysontop-preference.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=577576
 Patch21: Dont-warn-about-a-missing-session-file.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=530702
-Patch22: cm-selection-timestamp.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=598231
-Patch23: metacity-2.28-visual-bell.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=559816
 Patch24: metacity-2.28-empty-keybindings.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=604319
 Patch25: metacity-2.28-xioerror-unknown-display.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=604867
-Patch26: metacity-2.28-IceCloseConnection.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -116,27 +99,19 @@ API. This package exists purely for tech
 %patch4 -p1 -b .stop-spamming-xsession-errors
 %patch5 -p1 -b .dnd-keynav
 %patch6 -p1 -b .restart-if-running
-%patch7 -p1 -b .bell
-%patch8 -p1 -b .sound-cache
-%patch9 -p1 -b .tooltip
 %patch10 -p1 -b .screenshot-forkbomb
 %patch11 -p1 -b .workspaces
 %patch12 -p1 -b .fresh-tooltips
-%patch13 -p1 -b .sigterm
 
 %patch14 -p1 -b .raises-from-same-client
 %patch15 -p1 -b .raise-on-click-stacking
 %patch16 -p1 -b .focus-different-workspace
-%patch17 -p1 -b .xfce-terminal
 %patch18 -p1 -b .focus-on-motion
 %patch19 -p1 -b .no-focus-windows
 %patch20 -p1 -b .always-on-top
 %patch21 -p1 -b .missing-session
-%patch22 -p1 -b .cm-selection-timestamp
-%patch23 -p1 -b .visual-bell
 %patch24 -p1 -b .empty-keybindings
 %patch25 -p1 -b .xioerror-unknown-display
-%patch26 -p1 -b .IceCloseConnection
 
 # force regeneration
 rm src/metacity.schemas
@@ -244,6 +219,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Wed Jan 27 2010 Owen Taylor <otaylor at redhat.com> - 2.28.1-1
+- Update to 2.28.1, remove 7 patches now applied upstream
+
 * Sun Jan  3 2010 Owen Taylor <otaylor at redhat.com> - 2.28.0-15
 - Fix crash in _IceTransClose (rhbz 551994)
   The previous patch for rhbz 539905 didn't actually fix the


--- 0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch DELETED ---


--- 0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch DELETED ---


--- 0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch DELETED ---


--- Add-XFCE-Terminal-as-a-terminal.patch DELETED ---


--- cm-selection-timestamp.patch DELETED ---


--- default-theme.patch DELETED ---


--- metacity-2.28-IceCloseConnection.patch DELETED ---


--- metacity-2.28-visual-bell.patch DELETED ---


--- metacity-canberra.patch DELETED ---


--- metacity-dont-do-bad-stuff-on-sigterm.patch DELETED ---


--- metacity-dont-force-bell.patch DELETED ---


--- metacity-option-to-force-fullscreen.patch DELETED ---


--- metacity-struts.patch DELETED ---

