- Update to latest cvs snapshot to give meaningful failure error messages

- Don't remove build root in install, because it triggers a rebuild of
    metacity

3 files changed, 23 insertions, 15 deletions

diff --git a/.cvsignore b/.cvsignore
index c38ee8a..2088910 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-metacity-2.13.89.0.2006.02.16.tar.bz2
+metacity-2.13.89.0.2006.02.17.tar.bz2
 libcm-0.0.16.0.2006.02.16.tar.bz2
diff --git a/metacity.spec b/metacity.spec
index 9ad669a..6806790 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,16 +1,17 @@
 %define gettext_package metacity
 
-%define snapshot_date 2006.02.16
 %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
 
 Summary: Metacity window manager
 Name: metacity
-Version: %{metacity_version}.0.%{snapshot_date}
+Version: %{metacity_version}.0.%{metacity_snapshot_date}
 Release: 1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
-Source0: metacity-%{metacity_version}.0.%{snapshot_date}.tar.bz2
-Source1: libcm-%{libcm_version}.0.%{snapshot_date}.tar.bz2
+Source0: metacity-%{metacity_version}.0.%{metacity_snapshot_date}.tar.bz2
+Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -43,19 +44,20 @@ Metacity is a simple window manager that integrates nicely with
 GNOME 2.
 
 %prep
-%setup -q -n metacity-%{metacity_version}.0.%{snapshot_date}
-%setup -D -T -a1 -n metacity-%{metacity_version}.0.%{snapshot_date}
+%setup -q -n metacity-%{metacity_version}.0.%{metacity_snapshot_date}
+%setup -D -T -a1 -n metacity-%{metacity_version}.0.%{metacity_snapshot_date}
 
 %patch0 -p1 -b .ctrlaltdel
 %patch1 -p1 -b .static-cm
 %patch2 -p1 -b .fix-type
 
-pushd libcm-%{libcm_version}.0.%{snapshot_date}
+pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date}
 %patch3 -p1 -b .include-glxext
 popd
 
 %build
-pushd libcm-%{libcm_version}.0.%{snapshot_date}
+rm -rf $RPM_BUILD_ROOT
+pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date}
 %configure
 make
 make install DESTDIR=$RPM_BUILD_ROOT 
@@ -66,17 +68,15 @@ LIBS="$LIBS -lICE -lSM"
 LIBS="$LIBS -lX11 -lXext -lXinerama -lXrandr"
 LIBS="$LIBS -lXrender -lXcursor"
 LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite"
-LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{snapshot_date}/src/.libs/libcm.a"
+LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{libcm_snapshot_date}/src/.libs/libcm.a"
 export LIBS
 
 CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
 export CPPFLAGS
 
-autoconf
+autoreconf
 %configure --enable-compositor
 
-make
-
 SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION HAVE_COMPOSITE_EXTENSIONS"
 
 for I in $SHOULD_HAVE_DEFINED; do
@@ -90,8 +90,10 @@ for I in $SHOULD_HAVE_DEFINED; do
   fi
 done
 
+make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS"
+
 %install
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -130,6 +132,12 @@ done
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 17 2006 Ray Strode <rstrode@redhat.com> - 2.13.89.0.2006.02.17-1
+- Update to latest cvs snapshot to give meaningful failure error
+  messages
+- Don't remove build root in install, because it triggers a
+  rebuild of metacity
+
 * Thu Feb 16 2006 Ray Strode <rstrode@redhat.com> - 2.13.89.0.2006.02.16-1
 - Update to cvs snapshot to add the ability to 
   runtime enable compositor
diff --git a/sources b/sources
index f881496..86e59da 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6e8e728e55756dd689c2cb26a16fa764  metacity-2.13.89.0.2006.02.16.tar.bz2
+4c8a668019049dd6a4321ad0d0fc93ae  metacity-2.13.89.0.2006.02.17.tar.bz2
 72896fe1209ee3c85944ef52c373eb14  libcm-0.0.16.0.2006.02.16.tar.bz2