SPECS: compiz.spec, xorg-xserver-xgl.spec - 20060505

[wolf]

Author: wolf                         Date: Fri May  5 15:03:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 20060505

---- Files affected:
SPECS:
   compiz.spec (1.39 -> 1.40) , xorg-xserver-xgl.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/compiz.spec
diff -u SPECS/compiz.spec:1.39 SPECS/compiz.spec:1.40
--- SPECS/compiz.spec:1.39	Sun Apr 30 19:21:53 2006
+++ SPECS/compiz.spec	Fri May  5 17:03:06 2006
@@ -5,7 +5,7 @@
 %bcond_without	gnome		# don't build gnome-window-decorator
 %bcond_with	kde		# build kde-window-decorator (not working)
 #
-%define		_snap	20060430
+%define		_snap	20060505
 #
 Summary:	OpenGL window and compositing manager
 Summary(pl):	OpenGL-owy zarządca okien i składania
@@ -15,14 +15,14 @@
 License:	GPL/MIT
 Group:		X11
 Source0:	%{name}-%{_snap}.tar.bz2
-# Source0-md5:	fc79625701b36903cba32d7f1cc4f63e
+# Source0-md5:	3807b7f11534f8773a19f80f1031f853
 Source1:	%{name}-pld.png
 # Source1-md5:	3050dc90fd4e5e990bb5baeb82bd3c8a
 Patch0:		%{name}-minimize-scaler-mod.patch
 %if %{with gconf} || %{with gnome}
 BuildRequires:	GConf2-devel >= 2.0
 %endif
-BuildRequires:	OpenGL-devel
+BuildRequires:	Mesa-libGL-devel >= 6.5-1.20060411.2
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	glib2-devel >= 2.0
@@ -50,6 +50,7 @@
 BuildRequires:	qt4-build
 %endif
 Requires(post,preun):	GConf2
+Conflicts:	xorg-xserver-xgl < 0.0.20060505
 Obsoletes:	compiz-opacity
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -195,6 +196,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2006/05/05 15:03:06  wolf
+- 20060505
+
 Revision 1.39  2006/04/30 17:21:53  aflinta
 - added missing BR's
 

================================================================
Index: SPECS/xorg-xserver-xgl.spec
diff -u SPECS/xorg-xserver-xgl.spec:1.18 SPECS/xorg-xserver-xgl.spec:1.19
--- SPECS/xorg-xserver-xgl.spec:1.18	Wed Apr 26 17:19:03 2006
+++ SPECS/xorg-xserver-xgl.spec	Fri May  5 17:03:06 2006
@@ -6,16 +6,16 @@
 Summary:	Xgl X server
 Summary(pl):	Serwer X Xgl
 Name:		xorg-xserver-xgl
-%define		_mesasnap	20060424
-%define		_snap		20060426
+%define		_mesasnap	20060505
+%define		_snap		20060505
 Version:	0.0.%{_snap}
 Release:	1
 License:	MIT
 Group:		X11/Servers
 Source0:	xserver-%{_snap}.tar.bz2
-# Source0-md5:	bc8f3c05b36856e718fe9283039d1001
+# Source0-md5:	b0ef9f9fbffae3216b083a5515f96129
 Source1:	Mesa-%{_mesasnap}.tar.bz2
-# Source1-md5:	ded517e9e206ffc885992495319350bd
+# Source1-md5:	77a0d6d5b0e9af301d26f6fda1ea9d08
 URL:		http://www.freedesktop.org/wiki/Software/Xgl
 # for glx headers
 BuildRequires:	Mesa-libGL-devel
@@ -197,6 +197,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/05/05 15:03:06  wolf
+- 20060505
+
 Revision 1.18  2006/04/26 15:19:03  wolf
 - 20060426
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/compiz.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/xorg-xserver-xgl.spec?r1=1.18&r2=1.19&f=u