From 0b192930b9df396c4f2066b603f6c8f8d42da88d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 24 Jul 2007 02:36:02 +0000
Subject: 2.19.34

---
 .cvsignore    |  2 +-
 keysdir.patch | 12 ++++++++----
 metacity.spec |  7 +++++--
 sources       |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 77c01f4..1d9d149 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-metacity-2.19.21.tar.bz2
+metacity-2.19.34.tar.bz2
diff --git a/keysdir.patch b/keysdir.patch
index 0726f58..6c76c0a 100644
--- a/keysdir.patch
+++ b/keysdir.patch
@@ -1,11 +1,15 @@
 diff -up metacity-2.19.21/configure.in.keysdir metacity-2.19.21/configure.in
 --- metacity-2.19.21/configure.in.keysdir	2007-06-10 23:34:39.000000000 -0400
-+++ metacity-2.19.21/configure.in	2007-07-05 16:50:29.000000000 -0400
-@@ -176,6 +176,9 @@ else
++++ metacity-2.19.21/configure.in	2007-07-09 11:08:26.000000000 -0400
+@@ -176,6 +176,13 @@ else
     AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
  fi
  
-+GNOME_KEYBINDINGS_KEYSDIR=$($PKG_CONFIG --variable keysdir gnome-keybindings)
++if $PKG_CONFIG --exists gnome-keybindings; then
++  GNOME_KEYBINDINGS_KEYSDIR=$($PKG_CONFIG --variable keysdir gnome-keybindings)
++else
++  GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
++fi
 +AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
 +
  STARTUP_NOTIFICATION_VERSION=0.7
@@ -13,7 +17,7 @@ diff -up metacity-2.19.21/configure.in.keysdir metacity-2.19.21/configure.in
  if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
 diff -up metacity-2.19.21/src/Makefile.am.keysdir metacity-2.19.21/src/Makefile.am
 --- metacity-2.19.21/src/Makefile.am.keysdir	2007-04-05 14:45:12.000000000 -0400
-+++ metacity-2.19.21/src/Makefile.am	2007-07-05 16:51:07.000000000 -0400
++++ metacity-2.19.21/src/Makefile.am	2007-07-09 11:06:41.000000000 -0400
 @@ -163,7 +163,7 @@ schema_DATA = $(schema_in_files:.schemas
  
  @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/metacity.spec b/metacity.spec
index 046ecfe..8a1f86c 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,13 +1,13 @@
 %define gettext_package metacity
 
-%define metacity_version 2.19.21
+%define metacity_version 2.19.34
 
 %define metacity_filename metacity-%{metacity_version}
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2
 Patch0: keysdir.patch
@@ -149,6 +149,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Jul 23 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.34-1
+- Update to 2.19.34
+
 * Fri Jul  6 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.21-3
 - Require control-center-filesystem
 
diff --git a/sources b/sources
index 0edbeae..19435d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bed83833d0be0478dcaa240d48e480b4  metacity-2.19.21.tar.bz2
+180f629ca3663be081ac492aab9cc699  metacity-2.19.34.tar.bz2
-- 
cgit