rpms/metacity/F-8 metacity.spec,1.134,1.135

[Colin Walters (walters)]

Author: walters

Update of /cvs/pkgs/rpms/metacity/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26708

Modified Files:
	metacity.spec 
Log Message:
revert workspace-present patch for now


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-8/metacity.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- metacity.spec	18 Oct 2007 23:44:21 -0000	1.134
+++ metacity.spec	12 Nov 2007 18:48:02 -0000	1.135
@@ -7,12 +7,12 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.20/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=482354
-Patch1: metacity-firefox-workaround-2.patch
+Patch1: metacity-2.20.0-dont-move-windows.patch
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,7 +66,8 @@
 %prep
 %setup -q -n %{metacity_filename}
 %patch0 -p1 -b .default-theme
-%patch1 -p0 -b .firefox-workaround
+# Disabled for now until it's upstream
+#%patch1 -p1 -b .dont-move
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -153,6 +154,11 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Nov 12 2007 Colin Walters <walters at redhat.com> - 2.20.0-4
+- Revert patch for now since the Firefox change we wanted isn't in either.
+  Will readd when upstreamed and Firefox 3 is in the distro.
+  Fixes bugzilla.redhat.com #371161.
+
 * Thu Oct 18 2007 Colin Walters <walters at redhat.com> - 2.20.0-3
 - Add patch to fix workspace behavior when presenting normal windows