rpms/metacity/devel libcm-0.0.16.0.2006.02.16-include-glxext.patch, NONE, 1.1 metacity-2.13.89.0.2006.02.16-fix-type.patch, NONE, 1.1 metacity-2.13.89.0.2006.02.16-static-cm.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 metacity.spec, 1.53, 1.54 sources, 1.31, 1.32 metacity-2.11.2-truncate-long-window-titles.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 17 01:25:04 UTC 2006
- Previous message (by thread): rpms/xorg-x11-proto-devel/devel .cvsignore, 1.9, 1.10 sources, 1.8, 1.9 xorg-x11-proto-devel.spec, 1.18, 1.19
- Next message (by thread): rpms/kernel/devel patch-2.6.16-rc3-git8.bz2.sign, NONE, 1.1 .cvsignore, 1.354, 1.355 kernel-2.6.spec, 1.1959, 1.1960 linux-2.6-random-patches.patch, 1.2, 1.3 sources, 1.296, 1.297 upstream, 1.271, 1.272 patch-2.6.16-rc3-git7.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rstrode
Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv691
Modified Files:
.cvsignore metacity.spec sources
Added Files:
libcm-0.0.16.0.2006.02.16-include-glxext.patch
metacity-2.13.89.0.2006.02.16-fix-type.patch
metacity-2.13.89.0.2006.02.16-static-cm.patch
Removed Files:
metacity-2.11.2-truncate-long-window-titles.patch
Log Message:
- Update to cvs snapshot to add the ability to
runtime enable compositor
- change %%makeinstall to make install DESTDIR=..
libcm-0.0.16.0.2006.02.16-include-glxext.patch:
wsint.h | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE libcm-0.0.16.0.2006.02.16-include-glxext.patch ---
--- libcm-0.0.16.0.2006.02.16/src/wsint.h.include-glxext 2006-02-16 20:01:36.000000000 -0500
+++ libcm-0.0.16.0.2006.02.16/src/wsint.h 2006-02-16 20:02:34.000000000 -0500
@@ -3,6 +3,7 @@
#include <X11/extensions/Xcomposite.h>
#include <X11/extensions/Xdamage.h>
#include <GL/glx.h>
+#include <GL/glxext.h>
#include "ws.h"
metacity-2.13.89.0.2006.02.16-fix-type.patch:
metacity.schemas.in | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE metacity-2.13.89.0.2006.02.16-fix-type.patch ---
--- metacity-2.13.89.0.2006.02.16/src/metacity.schemas.in.fix-type 2006-02-16 19:51:13.000000000 -0500
+++ metacity-2.13.89.0.2006.02.16/src/metacity.schemas.in 2006-02-16 19:51:22.000000000 -0500
@@ -272,7 +272,7 @@
<key>/schemas/apps/metacity/general/compositing_manager</key>
<applyto>/apps/metacity/general/compositing_manager</applyto>
<owner>metacity</owner>
- <type>boolean</type>
+ <type>bool</type>
<default>FALSE</default>
<locale name="C">
<short>Compositing Manager</short>
metacity-2.13.89.0.2006.02.16-static-cm.patch:
configure.in | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE metacity-2.13.89.0.2006.02.16-static-cm.patch ---
--- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 13 Feb 2006 20:09:57 -0000 1.31
+++ .cvsignore 17 Feb 2006 01:25:02 -0000 1.32
@@ -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
Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- metacity.spec 13 Feb 2006 20:09:57 -0000 1.53
+++ metacity.spec 17 Feb 2006 01:25:02 -0000 1.54
@@ -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: 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 @@
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 @@
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 @@
%{_mandir}/man1/*
%changelog
+* Thu Feb 16 2006 Ray Strode <rstrode at 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 at redhat.com> - 2.13.89-1
- Update to 2.13.89
@@ -121,7 +150,7 @@
* Thu Jan 26 2006 Matthias Clasen <mclasen at redhat.com> 2.13.34-1
- Update to 2.13.34
-* Mon Jan 16 2006 Ray Strode at redhat.com> 2.13.21-1
+* Mon Jan 16 2006 Ray Strode <rstrode at redhat.com> 2.13.21-1
- Update to 2.13.21
* Fri Jan 13 2006 Matthias Clasen <mclasen at redhat.com> 2.13.13-1
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 13 Feb 2006 20:09:57 -0000 1.31
+++ sources 17 Feb 2006 01:25:02 -0000 1.32
@@ -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
--- metacity-2.11.2-truncate-long-window-titles.patch DELETED ---
- Previous message (by thread): rpms/xorg-x11-proto-devel/devel .cvsignore, 1.9, 1.10 sources, 1.8, 1.9 xorg-x11-proto-devel.spec, 1.18, 1.19
- Next message (by thread): rpms/kernel/devel patch-2.6.16-rc3-git8.bz2.sign, NONE, 1.1 .cvsignore, 1.354, 1.355 kernel-2.6.spec, 1.1959, 1.1960 linux-2.6-random-patches.patch, 1.2, 1.3 sources, 1.296, 1.297 upstream, 1.271, 1.272 patch-2.6.16-rc3-git7.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list