rpms/compizconfig-backend-gconf/devel compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch, NONE, 1.1 compizconfig-backend-gconf.spec, 1.11, 1.12

[Leigh Scott]

Author: leigh123linux

Update of /cvs/pkgs/rpms/compizconfig-backend-gconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15982

Modified Files:
	compizconfig-backend-gconf.spec 
Added Files:
	compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch 
Log Message:
* Sat Dec 26 2009 Leigh Scott <leigh123linux at googlemail.com> - 0.8.2-3
- add patch to fix keybindings. (bug #550691)


compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch:
 gconf.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch ---
From: Danny Baumann <dannybaumann at web.de>
Date: Wed, 8 Apr 2009 18:30:16 +0000 (+0200)
Subject: Fix setting integration for screenshot and terminal commands.
X-Git-Tag: 0.8.4~4
X-Git-Url: http://gitweb.compiz.org/?p=fusion%2Fcompizconfig%2Fcompizconfig-backend-gconf;a=commitdiff_plain;h=f67aaea7e1161b221423d6015c38e6d7dd0af32d

Fix setting integration for screenshot and terminal commands.
---

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 8d104b3..cce63b1 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -351,11 +351,11 @@ const SpecialOption specialOptions[] = {
     {"rotate_right_window_key", "rotate", FALSE,
      METACITY "/window_keybindings/move_to_workspace_right", OptionKey},
 
-    {"command_screenshot", "core", FALSE,
+    {"command_screenshot", "gnomecompat", FALSE,
      METACITY "/keybinding_commands/command_screenshot", OptionString},
-    {"command_window_screenshot", "core", FALSE,
+    {"command_window_screenshot", "gnomecompat", FALSE,
      METACITY "/keybinding_commands/command_window_screenshot", OptionString},
-    {"command_terminal", "core", FALSE,
+    {"command_terminal", "gnomecompat", FALSE,
      "/desktop/gnome/applications/terminal/exec", OptionString},
 
     {"current_viewport", "thumbnail", TRUE,


Index: compizconfig-backend-gconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compizconfig-backend-gconf/devel/compizconfig-backend-gconf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- compizconfig-backend-gconf.spec	24 Jul 2009 19:22:39 -0000	1.11
+++ compizconfig-backend-gconf.spec	26 Dec 2009 22:28:46 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           compizconfig-backend-gconf
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GConf backend for compizconfig
 
 Group:          System Environment/Libraries
@@ -14,9 +14,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  libcompizconfig-devel >= %{basever}, GConf2-devel
 BuildRequires:  intltool, libtool
 # backend-gconf requires the gconf schemas from compiz-gnome to work
-Requires:       compiz-gnome >= %{basever} 
-#Patch100:       compizconfig-backend-gconf-gcc43-buildfix.patch
-#Patch101:       compizconfig-backend-gconf-gcc43-buildfix2.patch
+Requires:       compiz-gnome >= %{basever}
+# upstream patches
+# http://gitweb.compiz.org/?p=fusion/compizconfig/compizconfig-backend-gconf;a=commitdiff;h=f67aaea7e1161b221423d6015c38e6d7dd0af32d
+Patch100:       compizconfig-backend-gconf-f67aaea7e1161b221423d6015c38e6d7dd0af32d.patch
+
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64 
@@ -31,8 +33,8 @@ This package contains the Gconf backend 
 
 %prep
 %setup -q
-#%patch100 -p1 -b .gcc43-buildfix
-#%patch101 -p1 -b .gcc43-buildfix2
+%patch100 -p1 -b .compizconfig-backend-gconf
+
 
 %build
 %configure --disable-static
@@ -53,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/compizconfig/backends/libgconf.so
 
 %changelog
+* Sat Dec 26 2009 Leigh Scott <leigh123linux at googlemail.com> - 0.8.2-3
+- add patch to fix keybindings. (bug #550691)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild