diff options
author | Ray Strode <rstrode@fedoraproject.org> | 2006-02-17 01:25:02 +0000 |
---|---|---|
committer | Ray Strode <rstrode@fedoraproject.org> | 2006-02-17 01:25:02 +0000 |
commit | 6eb5ae31d544f8e7925fb391c9122cb701e3888e (patch) | |
tree | d0cfd485791be590178ddadd69bb4d565983d6d5 | |
parent | 5c7248ec70129a13d0c10121b126a4d7cc8d78bd (diff) | |
download | metacity-6eb5ae31d544f8e7925fb391c9122cb701e3888e.tar.gz metacity-6eb5ae31d544f8e7925fb391c9122cb701e3888e.tar.xz metacity-6eb5ae31d544f8e7925fb391c9122cb701e3888e.zip |
- Update to cvs snapshot to add the ability to runtime enable compositor
- change %%makeinstall to make install DESTDIR=..
-rw-r--r-- | .cvsignore | 6 | ||||
-rw-r--r-- | metacity-2.13.89.0.2006.02.16-static-cm.patch | 11 | ||||
-rw-r--r-- | metacity.spec | 67 | ||||
-rw-r--r-- | sources | 3 |
4 files changed, 63 insertions, 24 deletions
@@ -1,4 +1,2 @@ -metacity-2.13.21.tar.bz2 -metacity-2.13.34.tar.bz2 -metacity-2.13.55.tar.bz2 -metacity-2.13.89.tar.bz2 +metacity-2.13.89.0.2006.02.16.tar.bz2 +libcm-0.0.16.0.2006.02.16.tar.bz2 diff --git a/metacity-2.13.89.0.2006.02.16-static-cm.patch b/metacity-2.13.89.0.2006.02.16-static-cm.patch new file mode 100644 index 0000000..c687d30 --- /dev/null +++ b/metacity-2.13.89.0.2006.02.16-static-cm.patch @@ -0,0 +1,11 @@ +--- metacity-2.13.89.0.2006.02.16/configure.in.static-cm 2006-02-07 02:11:17.000000000 -0500 ++++ metacity-2.13.89.0.2006.02.16/configure.in 2006-02-07 02:11:52.000000000 -0500 +@@ -222,7 +222,7 @@ + + if test x$have_xcomposite = xyes; then + echo "Building with CompositeExt" +- METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage cm" ++ METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage" + AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support]) + + ## force on render also diff --git a/metacity.spec b/metacity.spec index 38412c9..9ad669a 100644 --- a/metacity.spec +++ b/metacity.spec @@ -1,11 +1,16 @@ %define gettext_package metacity +%define snapshot_date 2006.02.16 +%define libcm_version 0.0.16 +%define metacity_version 2.13.89 + Summary: Metacity window manager Name: metacity -Version: 2.13.89 +Version: %{metacity_version}.0.%{snapshot_date} Release: 1 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ -Source0: %{name}-%{version}.tar.bz2 +Source0: metacity-%{metacity_version}.0.%{snapshot_date}.tar.bz2 +Source1: libcm-%{libcm_version}.0.%{snapshot_date}.tar.bz2 License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root @@ -18,11 +23,19 @@ BuildRequires: libglade2-devel >= 2.0.0 BuildRequires: intltool >= 0.22 BuildRequires: startup-notification-devel >= 0.7 BuildRequires: libtool automake14 autoconf -Requires: startup-notification >= 0.7 +BuildRequires: xorg-x11-proto-devel >= 7.0-3 +BuildRequires: libSM-devel, libGL-devel, libGLU-devel, libICE-devel, libX11-devel +BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel +BuildRequires: libXcursor-devel, libXdamage-devel, libXtst-devel, libXfixes-devel, +BuildRequires: libXcomposite-devel +Requires: startup-notification >= 0.7 Requires: redhat-artwork >= 0.62 Patch0: metacity-2.4.13.90-ctrlaltdel.patch +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 %description @@ -30,30 +43,41 @@ Metacity is a simple window manager that integrates nicely with GNOME 2. %prep -%setup -q +%setup -q -n metacity-%{metacity_version}.0.%{snapshot_date} +%setup -D -T -a1 -n metacity-%{metacity_version}.0.%{snapshot_date} %patch0 -p1 -b .ctrlaltdel +%patch1 -p1 -b .static-cm +%patch2 -p1 -b .fix-type + +pushd libcm-%{libcm_version}.0.%{snapshot_date} +%patch3 -p1 -b .include-glxext +popd %build +pushd libcm-%{libcm_version}.0.%{snapshot_date} +%configure +make +make install DESTDIR=$RPM_BUILD_ROOT +popd -#libtoolize --copy --force -#aclocal-1.4 -#automake-1.4 -#autoconf +LIBS="$LIBS -lGL -lGLU" +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" +export LIBS -export LIBS="-lXext -lX11" -%configure +CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}" +export CPPFLAGS -## intltool munges metacity.schemas in UTF-8 locale -## http://bugzilla.gnome.org/show_bug.cgi?id=91289 -## force regeneration with intltool in non-UTF-8 locale -#rm -f src/metacity.schemas -#rm -f po/.intltool-merge-cache -#LANG=en_US.ISO-8859-1 make ## %{?_smp_mflags} +autoconf +%configure --enable-compositor make -SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION" +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 if ! grep -q "define $I" config.h; then @@ -70,7 +94,7 @@ done rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -106,6 +130,11 @@ done %{_mandir}/man1/* %changelog +* 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 +- change %%makeinstall to make install DESTDIR=.. + * Mon Feb 13 2006 Matthias Clasen <mclasen@redhat.com> - 2.13.89-1 - Update to 2.13.89 @@ -121,7 +150,7 @@ done * Thu Jan 26 2006 Matthias Clasen <mclasen@redhat.com> 2.13.34-1 - Update to 2.13.34 -* Mon Jan 16 2006 Ray Strode@redhat.com> 2.13.21-1 +* Mon Jan 16 2006 Ray Strode <rstrode@redhat.com> 2.13.21-1 - Update to 2.13.21 * Fri Jan 13 2006 Matthias Clasen <mclasen@redhat.com> 2.13.13-1 @@ -1 +1,2 @@ -836cf722209c59babff98075498193b9 metacity-2.13.89.tar.bz2 +6e8e728e55756dd689c2cb26a16fa764 metacity-2.13.89.0.2006.02.16.tar.bz2 +72896fe1209ee3c85944ef52c373eb14 libcm-0.0.16.0.2006.02.16.tar.bz2 |