diff --git a/compiz.spec b/compiz.spec index 166f3ec..8b7768a 100644 --- a/compiz.spec +++ b/compiz.spec @@ -14,7 +14,7 @@ URL: http://www.go-compiz.org License: X11/MIT/GPL Group: User Interface/Desktops Version: 0.7.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,7 @@ Obsoletes: beryl-core # Patches that are not upstream +Patch101: desktop-effects-0.7.17-ignore-hints.patch Patch102: desktop-effects-0.7.17-wall-plugin.patch Patch103: composite-cube-logo.patch Patch105: fedora-logo.patch @@ -121,6 +122,7 @@ and other kde integration related stuff. %setup -q pushd ../desktop-effects-%{dialogversion} +%patch101 -p1 -b .ignore-hints %patch102 -p1 -b .wall-plugin popd @@ -330,6 +332,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 13 2008 Adel Gadllah - 0.7.6-6 +- Don't use desktops and viewport at the same time + * Wed Jun 11 2008 Adel Gadllah - 0.7.6-5 - Revert to old gconf schmema install script diff --git a/desktop-effects-0.7.17-ignore-hints.patch b/desktop-effects-0.7.17-ignore-hints.patch new file mode 100644 index 0000000..99a60ac --- /dev/null +++ b/desktop-effects-0.7.17-ignore-hints.patch @@ -0,0 +1,12 @@ +diff -upNr desktop-effects-0.7.17.orign/desktop-effects.c desktop-effects-0.7.17/desktop-effects.c +--- desktop-effects-0.7.17.orign/desktop-effects.c 2008-01-17 19:22:37.000000000 +0100 ++++ desktop-effects-0.7.17/desktop-effects.c 2008-06-13 10:49:11.000000000 +0200 +@@ -251,7 +251,7 @@ start_compiz (App *app, GError **err) + if (!g_spawn_command_line_async ("gtk-window-decorator", err)) + return FALSE; + +- if (!g_spawn_command_line_async ("compiz --replace glib gconf", err)) ++ if (!g_spawn_command_line_async ("compiz --ignore-desktop-hints --replace glib gconf", err)) + return FALSE; + + app->compiz_running = TRUE;