- Update to 2.15.0metacity-2_15_0-1

3 files changed, 17 insertions, 18 deletions

diff --git a/.cvsignore b/.cvsignore
index d6c627a..8cf5b52 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-libcm-0.0.16.0.2006.03.06.tar.bz2
-metacity-2.14.0.tar.bz2
+libcm-0.0.17.tar.gz
+metacity-2.15.0.20060331.tar.gz
diff --git a/metacity.spec b/metacity.spec
index 7ea2ef6..6bf1cf1 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,16 +1,16 @@
 %define gettext_package metacity
 
-%define libcm_version 0.0.16
-%define libcm_snapshot_date 2006.03.06
-%define metacity_version 2.14.0
+%define libcm_version 0.0.17
+%define metacity_version 2.15.0
+%define metacity_snapshot 20060331
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
 Release: 1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
-Source0: metacity-%{metacity_version}.tar.bz2
-Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2
+Source0: metacity-%{metacity_version}.%{metacity_snapshot}.tar.gz
+Source1: libcm-%{libcm_version}.tar.gz
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -34,9 +34,7 @@ Requires: startup-notification >= 0.7
 Requires: redhat-artwork >= 0.62
 
 Patch0: metacity-2.4.13.90-ctrlaltdel.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
+Patch1: metacity-2.13.89.0.2006.02.16-static-cm.patch
 
 %description
 
@@ -44,18 +42,16 @@ Metacity is a simple window manager that integrates nicely with
 GNOME 2.
 
 %prep
-%setup -q -n metacity-%{metacity_version}
-%setup -D -T -a1 -n metacity-%{metacity_version}
+%setup -q -n metacity-%{metacity_version}.%{metacity_snapshot}
+%setup -D -T -a1 -n metacity-%{metacity_version}.%{metacity_snapshot}
 
 %patch0 -p1 -b .ctrlaltdel
-%patch1 -p1 -b .bling
-%patch2 -p1 -b .static-cm
-%patch3 -p1 -b .fix-type
+%patch1 -p1 -b .static-cm
 
 %build
 rm -rf $RPM_BUILD_ROOT
 %ifnarch s390 s390x ppc64
-pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date}
+pushd libcm-%{libcm_version}
 %configure
 make
 make install DESTDIR=$RPM_BUILD_ROOT 
@@ -142,6 +138,9 @@ done
 %{_mandir}/man1/*
 
 %changelog
+* Fri Mar 31 2006 Soren Sandmann <sandmann@redhat.com> - 2.15.0
+- Update to 2.15.0
+
 * Mon Mar 13 2006 Ray Strode <rstrode@redhat.com> - 2.14.0-1
 - update to 2.14.0
 
diff --git a/sources b/sources
index 2559749..7e03df8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-eba1b4b6d6a18eb4fc28e35045b63b0e  libcm-0.0.16.0.2006.03.06.tar.bz2
-2480951fb0636d3fc6a78ab8a54f355d  metacity-2.14.0.tar.bz2
+4bd27c1cf6de1bb57c4c0ad5d508cf6f  libcm-0.0.17.tar.gz
+df7434930a126a14995c9e98d9a4f736  metacity-2.15.0.20060331.tar.gz