# Conditional build:
%bcond_without gconf # gconf plugin
%bcond_without gtk # gtk window decorator
-%bcond_without gnome # gnome settings module
+%bcond_with gnome # gnome settings module
%bcond_without metacity # metacity theme support
-%bcond_without kde # kde-window-decorator and kconfig
-%bcond_with kde4 # kde4-window-decorator
-#
+%bcond_with kde # kde-window-decorator and kconfig
+%bcond_without kde4 # kde4-window-decorator
+
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.7.8
-Release: 2
+Version: 0.8.6
+Release: 3
License: GPL or MIT
Group: X11/Applications
-Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.gz
-# Source0-md5: e99977d9170a7bd5d571004eed038428
-Patch0: %{name}-DESTDIR.patch
-Patch1: %{name}-kde4.patch
-URL: http://compiz.org/
+Source0: http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: 1e284eade99ff310551d5919b6ba57c1
+Source1: %{name}-gtk
+Source2: %{name}-gtk.desktop
+Patch0: %{name}-kde4.patch
+Patch1: %{name}-no-gdk_display.patch
+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
BuildRequires: dbus-glib-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 2.0
# <sys/inotify.h>
BuildRequires: glibc-devel >= 6:2.4
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
BuildRequires: xorg-lib-libXdamage-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXrandr-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.18.1
-BuildRequires: xorg-lib-libXrender-devel >= 0.9.3
+BuildRequires: libwnck-devel >= 2.20.0
%if %{with gnome}
BuildRequires: gnome-control-center-devel >= 2.0
BuildRequires: gnome-desktop-devel >= 2.0
BuildRequires: gnome-menus-devel
%endif
%if %{with metacity}
-BuildRequires: metacity-devel >= 2.18.0
+BuildRequires: metacity-devel >= 2.24.0
%endif
%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
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
%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
%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 ini inotify minimize move place png regex resize rotate scale screenshot svg switcher video water wobbly zoom
-
%prep
%setup -q
-%patch0 -p1
-%patch1 -p0
+%patch0 -p0
+%patch1 -p1
%build
%{__intltoolize}
%{__autoconf}
%{__autoheader}
%{__automake}
-QTLIB=%{_libdir}; export QTLIB
-QTDIR=%{_prefix}; export QTDIR
+export QTLIB=%{_libdir}
+export QTDIR=%{_prefix}
%configure \
--disable-static \
--enable-librsvg \
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- desktopfilesdir=%{_datadir}/wm-properties \
DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.la
%endif
+%if %{with gtk}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
+desktop-file-install \
+ --vendor="" \
+ --dir $RPM_BUILD_ROOT%{_desktopdir} \
+ %{SOURCE2}
+%endif
+
%find_lang %{name}
%clean
%exclude %{_libdir}/compiz/libsvg.so
%{_datadir}/compiz/*.xml
%{_datadir}/compiz/*.png
-%{_datadir}/compiz/schemas.xslt
%exclude %{_datadir}/compiz/fs.xml
%exclude %{_datadir}/compiz/gconf.xml
%exclude %{_datadir}/compiz/svg.xml
%attr(755,root,root) %{_libdir}/compiz/libgconf.so
%{_sysconfdir}/gconf/schemas/compiz-*.schemas
%{_datadir}/compiz/gconf.xml
+%{_datadir}/compiz/schemas.xslt
# checked by compiz-fusion-plugins-* (with non-default --enable-schemas only)
%{_pkgconfigdir}/compiz-gconf.pc
%endif
%attr(755,root,root) %{_libdir}/window-manager-settings/libcompiz.so
%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
-%{_datadir}/wm-properties/compiz.desktop
+%{_datadir}/gnome/wm-properties/compiz-wm.desktop
+%{_desktopdir}/compiz.desktop
%endif
%if %{with gtk}
%files gtk-decorator
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/compiz-gtk
%attr(755,root,root) %{_bindir}/gtk-window-decorator
+%{_desktopdir}/compiz-gtk.desktop
%if %{with gconf}
%{_sysconfdir}/gconf/schemas/gwd.schemas
%endif