rpms/metacity/devel metacity-2.11.0-xcursor.patch, 1.1, 1.2 metacity.spec, 1.32, 1.33

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28248

Modified Files:
	metacity-2.11.0-xcursor.patch metacity.spec 
Log Message:
More xcursor fixes


metacity-2.11.0-xcursor.patch:
 config.h.in  |    2 ++
 configure    |   41 +++++++++++++++++++++++++++++++----------
 configure.in |   17 ++++++++++++++++-
 3 files changed, 49 insertions(+), 11 deletions(-)

Index: metacity-2.11.0-xcursor.patch
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity-2.11.0-xcursor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metacity-2.11.0-xcursor.patch	18 Jul 2005 04:18:36 -0000	1.1
+++ metacity-2.11.0-xcursor.patch	18 Jul 2005 05:50:35 -0000	1.2
@@ -1,5 +1,5 @@
---- metacity-2.11.0/configure.in.xcursor	2005-07-18 00:15:35.189075000 -0400
-+++ metacity-2.11.0/configure.in	2005-07-18 00:15:59.654585000 -0400
+--- metacity-2.11.0/configure.in.xcursor	2005-07-12 15:20:32.000000000 -0400
++++ metacity-2.11.0/configure.in	2005-07-18 01:43:53.887641000 -0400
 @@ -2,7 +2,7 @@
  
  # Fibonacci sequence for micro version numbering:
@@ -38,8 +38,8 @@
  "
  echo "This is the UNSTABLE branch of metacity"
  echo "Use 2.10.x for stable (gnome-2-10 branch in CVS)"
---- metacity-2.11.0/configure.xcursor	2005-07-18 00:15:45.415839000 -0400
-+++ metacity-2.11.0/configure	2005-07-18 00:16:08.604627000 -0400
+--- metacity-2.11.0/configure.xcursor	2005-07-12 15:54:23.000000000 -0400
++++ metacity-2.11.0/configure	2005-07-18 01:43:53.922606000 -0400
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -157,3 +157,11 @@
  "
  echo "This is the UNSTABLE branch of metacity"
  echo "Use 2.10.x for stable (gnome-2-10 branch in CVS)"
+--- metacity-2.11.0/config.h.in.xcursor	2005-07-18 01:44:43.261218000 -0400
++++ metacity-2.11.0/config.h.in	2005-07-18 01:44:56.021445000 -0400
+@@ -153,3 +153,5 @@
+ 
+ /* Define to 1 if the X Window System is missing or not being used. */
+ #undef X_DISPLAY_MISSING
++
++#undef HAVE_XCURSOR


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- metacity.spec	18 Jul 2005 04:18:36 -0000	1.32
+++ metacity.spec	18 Jul 2005 05:50:35 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: 2.11.0
-Release: 2
+Release: 3
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -37,6 +37,7 @@
 
 %patch0 -p1 -b .default-theme
 %patch1 -p1 -b .ctrlaltdel
+%patch2 -p1 -b .xcursor
 
 %build
 
@@ -110,7 +111,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Mon Jul 18 2005 Matthias Clasen <mclasen redhat com> 2.11.0-2
+* Mon Jul 18 2005 Matthias Clasen <mclasen redhat com> 2.11.0-3
 - fix xcursor detection
 
 * Wed Jul 13 2005 Matthias Clasen <mclasen redhat com> 2.11.0-1