- update to 2.13.144metacity-2_13_144-1

- add bling patch from HEAD

3 files changed, 21 insertions, 21 deletions

diff --git a/.cvsignore b/.cvsignore
index 2088910..853fa75 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-metacity-2.13.89.0.2006.02.17.tar.bz2
-libcm-0.0.16.0.2006.02.16.tar.bz2
+libcm-0.0.16.0.2006.03.06.tar.bz2
+metacity-2.13.144.tar.bz2
diff --git a/metacity.spec b/metacity.spec
index 6f34b77..e90050d 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,16 +1,15 @@
 %define gettext_package metacity
 
 %define libcm_version 0.0.16
-%define libcm_snapshot_date 2006.02.16
-%define metacity_version 2.13.89
-%define metacity_snapshot_date 2006.02.17
+%define libcm_snapshot_date 2006.03.06
+%define metacity_version 2.13.144
 
 Summary: Metacity window manager
 Name: metacity
-Version: %{metacity_version}.0.%{metacity_snapshot_date}
-Release: 2
+Version: %{metacity_version}
+Release: 1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
-Source0: metacity-%{metacity_version}.0.%{metacity_snapshot_date}.tar.bz2
+Source0: metacity-%{metacity_version}.tar.bz2
 Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
@@ -35,9 +34,9 @@ Requires: startup-notification >= 0.7
 Requires: redhat-artwork >= 0.62
 
 Patch0: metacity-2.4.13.90-ctrlaltdel.patch
-Patch1: metacity-2.13.89.0.2006.02.16-static-cm.patch
-Patch2: metacity-2.13.89.0.2006.02.16-fix-type.patch
-Patch3: libcm-0.0.16.0.2006.02.16-include-glxext.patch
+Patch1: metacity-2.13.144-bling.patch
+Patch2: metacity-2.13.89.0.2006.02.16-static-cm.patch
+Patch3: metacity-2.13.89.0.2006.02.16-fix-type.patch
 
 %description
 
@@ -45,16 +44,13 @@ Metacity is a simple window manager that integrates nicely with
 GNOME 2.
 
 %prep
-%setup -q -n metacity-%{metacity_version}.0.%{metacity_snapshot_date}
-%setup -D -T -a1 -n metacity-%{metacity_version}.0.%{metacity_snapshot_date}
+%setup -q -n metacity-%{metacity_version}
+%setup -D -T -a1 -n metacity-%{metacity_version}
 
 %patch0 -p1 -b .ctrlaltdel
-%patch1 -p1 -b .static-cm
-%patch2 -p1 -b .fix-type
-
-pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date}
-%patch3 -p1 -b .include-glxext
-popd
+%patch1 -p1 -b .bling
+%patch2 -p1 -b .static-cm
+%patch3 -p1 -b .fix-type
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -146,6 +142,10 @@ done
 %{_mandir}/man1/*
 
 %changelog
+* Mon Mar  6 2006 Ray Strode <rstrode@redhat.com> - 2.13.144-1
+- update to 2.13.144
+- add bling patch from HEAD
+
 * Sun Feb 19 2006 Ray Strode <rstrode@redhat.com> - 2.13.89.0.2006.02.17-2
 - disable compositor on s390 s390x and ppc64
 
diff --git a/sources b/sources
index 86e59da..f6b4d9c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4c8a668019049dd6a4321ad0d0fc93ae  metacity-2.13.89.0.2006.02.17.tar.bz2
-72896fe1209ee3c85944ef52c373eb14  libcm-0.0.16.0.2006.02.16.tar.bz2
+eba1b4b6d6a18eb4fc28e35045b63b0e  libcm-0.0.16.0.2006.03.06.tar.bz2
+81126bb03bfa77c63e1c49452a8e198c  metacity-2.13.144.tar.bz2