Author: sparky Date: Sun Nov 22 00:10:27 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- qt4-build is BRequired for kde4, not kde; adapterized
---- Files affected:
packages/compiz:
compiz.spec (1.114 -> 1.115)
---- Diffs:
================================================================
Index: packages/compiz/compiz.spec
diff -u packages/compiz/compiz.spec:1.114 packages/compiz/compiz.spec:1.115
--- packages/compiz/compiz.spec:1.114 Mon Nov 16 20:09:37 2009
+++ packages/compiz/compiz.spec Sun Nov 22 01:10:22 2009
@@ -23,8 +23,8 @@
%if %{with gconf} || %{with gtk}
BuildRequires: GConf2-devel >= 2.0
%endif
-BuildRequires: OpenGL-devel >= 2.1
BuildRequires: OpenGL-GLU-devel
+BuildRequires: OpenGL-devel >= 2.1
BuildRequires: autoconf >= 2.57
BuildRequires: automake >= 1:1.7
BuildRequires: cairo-devel >= 1.0
@@ -38,8 +38,8 @@
BuildRequires: libpng-devel
BuildRequires: librsvg-devel >= 1:2.14.0
BuildRequires: libtool
-BuildRequires: libxml2-devel
BuildRequires: libxcb-devel
+BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: libxslt-progs
BuildRequires: pkgconfig
@@ -49,8 +49,8 @@
BuildRequires: xorg-lib-libXdamage-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXrandr-devel
-BuildRequires: xorg-lib-libXres-devel
BuildRequires: xorg-lib-libXrender-devel >= 0.9.3
+BuildRequires: xorg-lib-libXres-devel
%if %{with gtk}
BuildRequires: gtk+2-devel >= 2:2.8.0
BuildRequires: libwnck-devel >= 2.20.0
@@ -65,14 +65,14 @@
%endif
%if %{with kde}
BuildRequires: dbus-qt-devel
-BuildRequires: kdelibs-devel
BuildRequires: kdebase-devel
+BuildRequires: kdelibs-devel
BuildRequires: qt-devel >= 1:3.0
-BuildRequires: qt4-build
%endif
%if %{with kde4}
-BuildRequires: kde4-kdelibs-devel
BuildRequires: kde4-kdebase-workspace-devel
+BuildRequires: kde4-kdelibs-devel
+BuildRequires: qt4-build
%endif
Requires: %{name}-libs = %{version}-%{release}
Obsoletes: compiz-opacity
@@ -80,16 +80,19 @@
Conflicts: xorg-xserver-xgl < 0.0.20060505
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# for gconf subpackage
+%define plugins annotate blur clone core cube dbus decoration fade fs
gconf glib gnomecompat ini inotify minimize move obs place png regex resize
rotate scale screenshot svg switcher video water wobbly zoom
+
%description
Compiz is a compositing window manager that uses 3D graphics
-acceleration via OpenGL. It provides various new graphical effects
-and features on any desktop environment, including Gnome and KDE.
+acceleration via OpenGL. It provides various new graphical effects and
+features on any desktop environment, including Gnome and KDE.
%description -l pl.UTF-8
Compiz jest menedżerem okien obsługującym składanie, który używa
akceleracji grafiki 3D przez OpenGL-a. Umożliwia on uzyskanie nowych
-efektów graficznych i możliwości w dowolnym środowisku, nie
-wyłączając Gnome i KDE.
+efektów graficznych i możliwości w dowolnym środowisku, nie wyłączając
+Gnome i KDE.
%package libs
Summary: Compiz libraries
@@ -232,9 +235,6 @@
%description kde4-decorator -l pl.UTF-8
Dekorator okien dla KDE 4.
-# for gconf subpackage
-%define plugins annotate blur clone core cube dbus decoration fade fs
gconf glib gnomecompat ini inotify minimize move obs place png regex resize
rotate scale screenshot svg switcher video water wobbly zoom
-
%prep
%setup -q
%patch0 -p0
@@ -400,6 +400,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.115 2009/11/22 00:10:22 sparky
+- qt4-build is BRequired for kde4, not kde; adapterized
+
Revision 1.114 2009/11/16 19:09:37 zbyniu
- BR: qt4-build
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/compiz/compiz.spec?r1=1.114&r2=1.115&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
