rpms/metacity/devel .cvsignore, 1.57, 1.58 keysdir.patch, 1.1, 1.2 metacity.spec, 1.120, 1.121 sources, 1.57, 1.58

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23152

Modified Files:
	.cvsignore keysdir.patch metacity.spec sources 
Log Message:
2.19.34



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	18 Jun 2007 17:13:08 -0000	1.57
+++ .cvsignore	24 Jul 2007 02:36:02 -0000	1.58
@@ -1 +1 @@
-metacity-2.19.21.tar.bz2
+metacity-2.19.34.tar.bz2

keysdir.patch:

Index: keysdir.patch
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/keysdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keysdir.patch	5 Jul 2007 21:08:54 -0000	1.1
+++ keysdir.patch	24 Jul 2007 02:36:02 -0000	1.2
@@ -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 @@
  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@


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- metacity.spec	6 Jul 2007 17:26:54 -0000	1.120
+++ metacity.spec	24 Jul 2007 02:36:02 -0000	1.121
@@ -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 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Jul 23 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.34-1
+- Update to 2.19.34
+
 * Fri Jul  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.21-3
 - Require control-center-filesystem
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	18 Jun 2007 17:13:08 -0000	1.57
+++ sources	24 Jul 2007 02:36:02 -0000	1.58
@@ -1 +1 @@
-bed83833d0be0478dcaa240d48e480b4  metacity-2.19.21.tar.bz2
+180f629ca3663be081ac492aab9cc699  metacity-2.19.34.tar.bz2