SPECS: compiz-quinnstorm.spec - Provides and Obsoletes: compiz; ad...

[shadzik]

Author: shadzik                      Date: Sun Jul  2 13:07:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Provides and Obsoletes: compiz; adapterized

---- Files affected:
SPECS:
   compiz-quinnstorm.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/compiz-quinnstorm.spec
diff -u SPECS/compiz-quinnstorm.spec:1.3 SPECS/compiz-quinnstorm.spec:1.4
--- SPECS/compiz-quinnstorm.spec:1.3	Wed Jun 21 11:54:58 2006
+++ SPECS/compiz-quinnstorm.spec	Sun Jul  2 15:07:15 2006
@@ -24,8 +24,8 @@
 %if %{with gconf} || %{with gnome}
 BuildRequires:	GConf2-devel >= 2.0
 %endif
-#BuildRequires:	Mesa-libGL-devel >= 6.5-1.20060411.2
 BuildRequires:	Mesa-libGL-devel >= 6.5-1.20060411.1
+#BuildRequires:	Mesa-libGL-devel >= 6.5-1.20060411.2
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	glib2-devel >= 2.0
@@ -55,9 +55,11 @@
 BuildRequires:	qt4-build
 %endif
 Requires(post,preun):	GConf2
-Conflicts:	xorg-xserver-xgl < 0.0.20060505
-Conflicts:	compiz
+Provides:	compiz
+Obsoletes:	compiz
 Obsoletes:	compiz-opacity
+Conflicts:	compiz
+Conflicts:	xorg-xserver-xgl < 0.0.20060505
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -67,8 +69,8 @@
 designed to run well on most graphics hardware.
 
 This is an enhanced version of compiz, developed mainlly by
-Quinnstorm. Some parts were optimized for speed and there were added few
-additional plugins and patches, delivering even more eyecandy.
+Quinnstorm. Some parts were optimized for speed and there were added
+few additional plugins and patches, delivering even more eyecandy.
 
 %description -l pl
 Compiz jest OpenGL-owym zarządcą składania, używającym rozszerzenia
@@ -85,7 +87,7 @@
 Summary:	Header files for compiz
 Summary(pl):	Pliki nagłówkowe dla compiza
 Group:		Development
-# (by compiz.pc; header requires only: OpenGL-devel, startup-notification-devel, damageproto, xextproto, libX11-devel)
+# (by compiz.pc; header requires only:OpenGL-devel, startup-notification-devel, damageproto, xextproto, libX11-devel)
 Requires:	OpenGL-devel
 Requires:	libpng-devel
 Requires:	startup-notification-devel >= 0.7
@@ -220,6 +222,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/07/02 13:07:15  shadzik
+- Provides and Obsoletes: compiz; adapterized
+
 Revision 1.3  2006/06/21 09:54:58  czarny
  - up to 0.0.13.3-r1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/compiz-quinnstorm.spec?r1=1.3&r2=1.4&f=u