- Update to 2.15.13. Disable compositing manager.

3 files changed, 6 insertions, 32 deletions

diff --git a/.cvsignore b/.cvsignore
index e817b8b..147b07c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,3 +10,4 @@ metacity-2.15.3.tar.bz2
 libcm-0.0.22.tar.gz
 metacity-2.15.5-jun1-2006.tar.gz
 metacity-2.15.5-jun6-2006.tar.gz
+metacity-2.15.13.tar.gz
diff --git a/metacity.spec b/metacity.spec
index 1d4a714..463bdd1 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,6 +1,5 @@
 %define gettext_package metacity
 
-%define libcm_version 0.0.22
 %define metacity_version 2.15.5
 
 %define metacity_filename metacity-%{metacity_version}-jun6-2006
@@ -12,7 +11,6 @@ Version: %{metacity_version}
 Release: 6.1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{metacity_filename}.tar.gz
-Source1: libcm-%{libcm_version}.tar.gz
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -28,13 +26,10 @@ BuildRequires: libtool automake autoconf gettext
 BuildRequires: xorg-x11-proto-devel >= 7.0-13
 BuildRequires: libSM-devel, libGL-devel, libGLU-devel, libICE-devel, libX11-devel
 BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
-BuildRequires: libXcursor-devel, libXdamage-devel, libXtst-devel, libXfixes-devel, 
-BuildRequires: libXcomposite-devel >= 0.3
-BuildRequires: mesa-libGL-devel >= 6.5-7
+BuildRequires: libXcursor-devel
 
 Requires: startup-notification >= 0.7
 Requires: redhat-artwork >= 0.62
-Requires: libXcomposite >= 0.3
 
 Patch0: metacity-2.4.13.90-ctrlaltdel.patch
 Patch1: metacity-2.13.89.0.2006.02.16-static-cm.patch
@@ -46,48 +41,22 @@ GNOME 2.
 
 %prep
 %setup -q -n %{metacity_filename}
-%setup -D -T -a1 -n %{metacity_filename}
 
 %patch0 -p1 -b .ctrlaltdel
 %patch1 -p1 -b .static-cm
 
 %build
 rm -rf $RPM_BUILD_ROOT
-%ifnarch s390 s390x ppc64
-pushd libcm-%{libcm_version}
-%configure
-make
-make install DESTDIR=$RPM_BUILD_ROOT 
-popd
-%endif
-
-LIBS="$LIBS -lGL -lGLU"
-LIBS="$LIBS -lICE -lSM"
-LIBS="$LIBS -lX11 -lXext -lXinerama -lXrandr"
-LIBS="$LIBS -lXrender -lXcursor"
-LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite"
-%ifnarch s390 s390x ppc64
-LIBS="$LIBS $PWD/libcm-%{libcm_version}/src/.libs/libcm.a"
-%endif
-export LIBS
 
 CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
 export CPPFLAGS
 
 autoreconf
 
-%ifnarch s390 s390x ppc64
-%configure --enable-compositor
-%else
 %configure
-%endif
 
 SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
 
-%ifnarch s390 s390x ppc64
-SHOULD_HAVE_DEFINED="$SHOULD_HAVE_DEFINED HAVE_COMPOSITE_EXTENSIONS"
-%endif
-
 for I in $SHOULD_HAVE_DEFINED; do
   if ! grep -q "define $I" config.h; then
     echo "$I was not defined in config.h"
@@ -141,6 +110,9 @@ done
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 7 2006 Soren Sandmann <sandmann@redhat.com> - 2.15.13-1
+- Update to 2.15.13. Disable compositing manager.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.15.5-6.1
 - rebuild
 
diff --git a/sources b/sources
index c5a7e5d..de7e942 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 9675b782627ef9fdbbaaec30ee9f1b77  libcm-0.0.22.tar.gz
 6b09abf0f66bc7a6f595b6f6be180a69  metacity-2.15.5-jun6-2006.tar.gz
+dd4c19b5332102166735c1482252ac5e  metacity-2.15.13.tar.gz