- merged from HEAD

Changed files:
    metacity-libtool.patch -> 1.2.10.1
    metacity.spec -> 1.101.2.1

diff --git a/metacity-libtool.patch b/metacity-libtool.patch
index 91424adbd7d2cffad5e4d2fdcc8b5722ac674bf7..e8161894f26fddc644a0ca2cce57dd95ac08c67a 100644 (file)
--- a/metacity-libtool.patch
+++ b/metacity-libtool.patch
@@ -1,7 +1,7 @@
-diff -urN metacity-2.4.8.orig/src/Makefile.am metacity-2.4.8/src/Makefile.am
---- metacity-2.4.8.orig/src/Makefile.am        Mon Dec  9 21:58:58 2002
-+++ metacity-2.4.8/src/Makefile.am     Mon Dec  9 22:03:04 2002
-@@ -31,8 +31,6 @@
+diff -aurN metacity-2.13.3.orig/src/Makefile.am metacity-2.13.3/src/Makefile.am
+--- metacity-2.13.3.orig/src/Makefile.am       2005-11-21 17:04:57.000000000 +0100
++++ metacity-2.13.3/src/Makefile.am    2005-11-24 15:11:29.000000000 +0100
+@@ -41,8 +41,6 @@
        frame.h                                 \
        frames.c                                \
        frames.h                                \
@@ -10,7 +10,7 @@ diff -urN metacity-2.4.8.orig/src/Makefile.am metacity-2.4.8/src/Makefile.am
        group.c                                 \
        group.h                                 \
        group-private.h                         \
-@@ -64,16 +62,10 @@
+@@ -74,16 +72,10 @@
        stack.h                                 \
        tabpopup.c                              \
        tabpopup.h                              \
@@ -27,7 +27,7 @@ diff -urN metacity-2.4.8.orig/src/Makefile.am metacity-2.4.8/src/Makefile.am
        window.c                                \
        window.h                                \
        window-props.c                          \
-@@ -117,17 +109,17 @@
+@@ -133,18 +125,18 @@
  libexec_PROGRAMS=metacity-dialog
  
  EFENCE=
@@ -36,16 +36,17 @@ diff -urN metacity-2.4.8.orig/src/Makefile.am metacity-2.4.8/src/Makefile.am
  metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
  metacity_dialog_LDADD=@METACITY_LIBS@
  
+ testboxes_SOURCES=util.h util.c boxes.h boxes.c testboxes.c
 -testgradient_SOURCES=gradient.h gradient.c testgradient.c
 +testgradient_SOURCES=testgradient.c
  testasyncgetprop_SOURCES=async-getprop.h async-getprop.c testasyncgetprop.c
  
- noinst_PROGRAMS=testgradient testasyncgetprop
+ noinst_PROGRAMS=testboxes testgradient testasyncgetprop
  
+-testboxes_LDADD= @METACITY_LIBS@
 -testgradient_LDADD= @METACITY_LIBS@
--testasyncgetprop_LDADD= @METACITY_LIBS@
++testboxes_LDADD= @METACITY_LIBS@ 
 +testgradient_LDADD= @METACITY_LIBS@ libmetacity-private.la
-+testasyncgetprop_LDADD= @METACITY_LIBS@ 
+ testasyncgetprop_LDADD= @METACITY_LIBS@
  
  desktopfilesdir=$(datadir)/gnome/wm-properties
- desktopfiles_in_files=metacity.desktop.in

diff --git a/metacity.spec b/metacity.spec
index 262dc5a824a05381e1eb5386534aa80e9c0a68f4..b0e13b2096f9dd5c3e2af0aa416810a8384f2799 100644 (file)
--- a/metacity.spec
+++ b/metacity.spec
@@ -8,13 +8,13 @@
 Summary:       Metacity window manager
 Summary(pl):   Zarz±dca okien Metacity
 Name:          metacity
-Version:       2.12.3
+Version:       2.14.3
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         X11/Window Managers
-Source0:       http://ftp.gnome.org/pub/gnome/sources/metacity/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 15df85021a8aa1d95fe60551105129db
+Source0:       http://ftp.gnome.org/pub/gnome/sources/metacity/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 57c0bc3cf4103097e126df892ecc1d58
 Patch0:                %{name}-libtool.patch
 Patch1:                %{name}-swap-resize-button.patch
 BuildRequires: GConf2-devel >= 2.12.0