diff options
| author | Ray Strode <rstrode@fedoraproject.org> | 2006-02-19 19:45:56 +0000 |
|---|---|---|
| committer | Ray Strode <rstrode@fedoraproject.org> | 2006-02-19 19:45:56 +0000 |
| commit | a9749df2d47910c2d7231789fe3731733c72417c (patch) | |
| tree | 3e9f34febe850687c140dfc9ac3c23c57e922ea5 | |
| parent | 16e31a87d022ce0d6f8a1b52f191f00c7f2fd905 (diff) | |
| download | metacity-a9749df2d47910c2d7231789fe3731733c72417c.tar.gz metacity-a9749df2d47910c2d7231789fe3731733c72417c.tar.xz metacity-a9749df2d47910c2d7231789fe3731733c72417c.zip | |
- disable compositor on s390 s390x and ppc64
| -rw-r--r-- | metacity.spec | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/metacity.spec b/metacity.spec index ae9f038..c489d69 100644 --- a/metacity.spec +++ b/metacity.spec @@ -39,8 +39,6 @@ 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 -ExcludeArch: s390 s390x ppc64 - %description Metacity is a simple window manager that integrates nicely with @@ -60,25 +58,34 @@ popd %build rm -rf $RPM_BUILD_ROOT +%ifnarch s390 s390x ppc64 pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date} %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}.0.%{libcm_snapshot_date}/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 HAVE_COMPOSITE_EXTENSIONS" @@ -135,6 +142,9 @@ done %{_mandir}/man1/* %changelog +* Sun Feb 19 2006 Ray Strode <rstrode@redhat.com> - 2.13.89.0.2006.02.17-2 +- disable compositor on s390 s390x and ppc64 + * 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 |