This commit is contained in:
Matthias Clasen 2007-06-06 03:29:26 +00:00
parent 0e021a98b6
commit 0794937841
4 changed files with 13 additions and 15 deletions

View File

@ -1,2 +1 @@
compiz-0.3.6.tar.bz2 compiz-0.4.0.tar.gz
desktop-effects-0.7.1.tar.bz2

View File

@ -5,8 +5,8 @@ Name: compiz
Url: http://www.go-compiz.org Url: http://www.go-compiz.org
License: X11/MIT/GPL License: X11/MIT/GPL
Group: User Interface/Desktops Group: User Interface/Desktops
Version: 0.3.6 Version: 0.4.0
Release: 10%{?dist} Release: 1%{?dist}
Summary: OpenGL window and compositing manager Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -38,7 +38,7 @@ BuildRequires: dbus-devel
BuildRequires: librsvg2-devel BuildRequires: librsvg2-devel
BuildRequires: metacity-devel >= 2.18 BuildRequires: metacity-devel >= 2.18
Source0: %{name}-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.gz
Source1: desktop-effects-%{dialogversion}.tar.bz2 Source1: desktop-effects-%{dialogversion}.tar.bz2
# Patches that are not upstream # Patches that are not upstream
@ -46,8 +46,6 @@ Patch101: aiglx-defaults.patch
Patch102: tfp-server-extension.patch Patch102: tfp-server-extension.patch
Patch103: composite-cube-logo.patch Patch103: composite-cube-logo.patch
Patch105: fedora-logo.patch Patch105: fedora-logo.patch
Patch114: restart.patch
Patch116: terminate-move.patch
Patch117: close-session.patch Patch117: close-session.patch
Patch118: compiz-0.3.6-wnck-modal-window.patch Patch118: compiz-0.3.6-wnck-modal-window.patch
@ -81,8 +79,6 @@ windows and compositing manager.
%patch102 -p1 -b .tfp-server-extension %patch102 -p1 -b .tfp-server-extension
%patch103 -p1 -b .composite-cube-logo %patch103 -p1 -b .composite-cube-logo
%patch105 -p1 -b .fedora-logo %patch105 -p1 -b .fedora-logo
%patch114 -p1 -b .restart
%patch116 -p1 -b .terminate-move
%patch117 -p1 -b .close-session %patch117 -p1 -b .close-session
%patch118 -p1 -b .wnck-modal-window %patch118 -p1 -b .wnck-modal-window
@ -200,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libdecoration.so %{_libdir}/libdecoration.so
%changelog %changelog
* Tue Jun 5 2007 Matthias Clasen <mclasen@redhat.com> - 0.4.0-1
- Update to 0.4.0
* Mon Jun 4 2007 Matthias Clasen <mclasen@redhat.com> - 0.3.6-10 * Mon Jun 4 2007 Matthias Clasen <mclasen@redhat.com> - 0.3.6-10
- Rebuild against new libwnck - Rebuild against new libwnck

View File

@ -1,2 +1,2 @@
260b03fc9ae62ff1ad4e8c5e92d56180 compiz-0.3.6.tar.bz2 b09499d45b59f92b8a188625733590f4 compiz-0.4.0.tar.gz
e11f289f7dfe8a6a6b321f21ee938d2b desktop-effects-0.7.1.tar.bz2 e11f289f7dfe8a6a6b321f21ee938d2b desktop-effects-0.7.1.tar.bz2

View File

@ -1,15 +1,15 @@
--- compiz-0.3.6/src/screen.c~ 2006-12-29 14:24:40.000000000 -0500 --- compiz-0.4.0/src/screen.c.tfp-server-extension 2007-04-02 05:05:49.000000000 -0400
+++ compiz-0.3.6/src/screen.c 2007-01-12 16:01:34.000000000 -0500 +++ compiz-0.4.0/src/screen.c 2007-06-05 23:20:52.000000000 -0400
@@ -1384,7 +1384,7 @@ @@ -1396,7 +1396,7 @@ addScreen (CompDisplay *display,
Window *children; Window *children;
unsigned int nchildren; unsigned int nchildren;
int defaultDepth, nvisinfo, nElements, value, i; int defaultDepth, nvisinfo, nElements, value, i;
- const char *glxExtensions, *glExtensions; - const char *glxExtensions, *glExtensions;
+ const char *glxExtensions, *glxServerExtensions, *glExtensions; + const char *glxExtensions, *glxServerExtensions, *glExtensions;
GLint stencilBits;
XSetWindowAttributes attrib; XSetWindowAttributes attrib;
GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f }; GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f };
@@ -1630,7 +1630,10 @@ GLfloat ambientLight[] = { 0.0f, 0.0f, 0.0f, 0.0f };
@@ -1645,7 +1645,10 @@ addScreen (CompDisplay *display,
i++; i++;
glxExtensions = glXQueryExtensionsString (dpy, screenNum); glxExtensions = glXQueryExtensionsString (dpy, screenNum);