- release 2

[packages/compiz.git] / compiz.spec

diff --git a/compiz.spec b/compiz.spec
index 9d918ec129cbb81efc544e3e9c8d9273b23be752..f327c73db3a81735cbcacdf5bc2de4c5b4d1fbd3 100644 (file)
--- a/compiz.spec
+++ b/compiz.spec
@@ -4,31 +4,26 @@
 %bcond_without gtk             # gtk window decorator
 %bcond_without gnome           # gnome settings module
 %bcond_without metacity        # metacity theme support
-%if "%{pld_release}" == "ti"
-%bcond_without kde             # kde-window-decorator and kconfig
-%bcond_with    kde4            # kde4-window-decorator
-%else
 %bcond_with    kde             # kde-window-decorator and kconfig
 %bcond_without kde4            # kde4-window-decorator
-%endif
 #
 Summary:       OpenGL window and compositing manager
 Summary(pl.UTF-8):     OpenGL-owy zarządca okien i składania
 Name:          compiz
 # note that even versions are STABLE
-Version:       0.8.2
+Version:       0.8.4
 Release:       2
 License:       GPL or MIT
 Group:         X11/Applications
-Source0:       http://releases.compiz-fusion.org/core/%{name}-%{version}.tar.gz
-# Source0-md5: 5815da87a0cfc014d06378cb3a2efcd5
+Source0:       http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: 03fa78ce0c464f3a413b2a3b74f09559
 Patch0:                %{name}-kde4.patch
-URL:           http://compiz.org/
+URL:           http://www.compiz.org/
 %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
@@ -42,8 +37,8 @@ BuildRequires:        libfuse-devel >= 2.2
 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
@@ -53,8 +48,8 @@ BuildRequires:        xorg-lib-libXcomposite-devel
 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
@@ -69,13 +64,14 @@ BuildRequires:      metacity-devel >= 2.24.0
 %endif
 %if %{with kde}
 BuildRequires: dbus-qt-devel
-BuildRequires: kdelibs-devel
 BuildRequires: kdebase-devel
+BuildRequires: kdelibs-devel
 BuildRequires: qt-devel >= 1:3.0
 %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
@@ -83,16 +79,19 @@ Conflicts:  filesystem < 3.0-20
 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
@@ -156,13 +155,13 @@ GConf plugin for Compiz (GConf control backend).
 %description gconf -l pl.UTF-8
 Wtyczka GConf dla Compiza (backend sterujący oparty na GConfie).
 
-%package kconfig 
+%package kconfig
 Summary:       kconfig plugin for Compiz
 Summary(pl.UTF-8):     Wtyczka kconfig dla Compiza
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 
-%description kconfig 
+%description kconfig
 kconfig plugin for Compiz (KDE control backend).
 
 %description kconfig -l pl.UTF-8
@@ -235,9 +234,6 @@ Window decorator for KDE 4.
 %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