rpms/metacity/devel .cvsignore, 1.36, 1.37 metacity.spec, 1.63, 1.64 sources, 1.36, 1.37

[fedora-cvs-commits redhat com]

Author: sandmann

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10711

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
* Fri Mar 31 2006 Soren Sandmann <sandmann redhat com> - 2.15.0
- Update to 2.15.0




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	13 Mar 2006 23:55:02 -0000	1.36
+++ .cvsignore	31 Mar 2006 21:57:10 -0000	1.37
@@ -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


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- metacity.spec	13 Mar 2006 23:48:36 -0000	1.63
+++ metacity.spec	31 Mar 2006 21:57:10 -0000	1.64
@@ -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: 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 @@
 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 @@
 %{_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
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Mar 2006 23:55:02 -0000	1.36
+++ sources	31 Mar 2006 21:57:10 -0000	1.37
@@ -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