rpms/metacity
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- disable compositor on s390 s390x and ppc64

Browse Source
This commit is contained in:
Ray Strode 2006-02-19 19:45:56 +00:00
parent 16e31a87d0
commit a9749df2d4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
metacity.spec
View File

@ -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 Patch2: metacity-2.13.89.0.2006.02.16-fix-type.patch
Patch3: libcm-0.0.16.0.2006.02.16-include-glxext.patch Patch3: libcm-0.0.16.0.2006.02.16-include-glxext.patch
ExcludeArch: s390 s390x ppc64
%description %description
Metacity is a simple window manager that integrates nicely with Metacity is a simple window manager that integrates nicely with
@ -60,25 +58,34 @@ popd
%build %build
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%ifnarch s390 s390x ppc64
pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date} pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date}
%configure %configure
make make
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
popd popd
%endif
LIBS="$LIBS -lGL -lGLU" LIBS="$LIBS -lGL -lGLU"
LIBS="$LIBS -lICE -lSM" LIBS="$LIBS -lICE -lSM"
LIBS="$LIBS -lX11 -lXext -lXinerama -lXrandr" LIBS="$LIBS -lX11 -lXext -lXinerama -lXrandr"
LIBS="$LIBS -lXrender -lXcursor" LIBS="$LIBS -lXrender -lXcursor"
LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite" LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite"
%ifnarch s390 s390x ppc64
LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{libcm_snapshot_date}/src/.libs/libcm.a" LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{libcm_snapshot_date}/src/.libs/libcm.a"
%endif
export LIBS export LIBS
CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}" CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
export CPPFLAGS export CPPFLAGS
autoreconf autoreconf
%ifnarch s390 s390x ppc64
%configure --enable-compositor %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" 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/* %{_mandir}/man1/*
%changelog %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 * 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 - Update to latest cvs snapshot to give meaningful failure error
messages messages