Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/rpms
diff options
context:
space:
mode:
authorSteven M. Parrish <smparrish@gmail.com>2010-09-26 16:11:10 (GMT)
committer Steven M. Parrish <smparrish@gmail.com>2010-09-26 16:11:10 (GMT)
commitf7fa9cac614ec8045126dbd47e3cc11b46a7a49c (patch)
tree9e5e3292bb89eda9a36754625ca8036436768b67 /rpms
parenteb1670ffd6d4fe2fae89d3288f43f33df9ebc877 (diff)
parent82f43b9559e12f8518b0c6d191370c18eb18aeec (diff)
Merge branch 'master' of git://git.sugarlabs.org/dextrose/mainline
Diffstat (limited to 'rpms')
-rw-r--r--rpms/sugar/add-button-frame.patch12
-rw-r--r--rpms/sugar/sugar.spec6
2 files changed, 17 insertions, 1 deletions
diff --git a/rpms/sugar/add-button-frame.patch b/rpms/sugar/add-button-frame.patch
new file mode 100644
index 0000000..eaedbc8
--- /dev/null
+++ b/rpms/sugar/add-button-frame.patch
@@ -0,0 +1,12 @@
+diff -u -r -N sugar-0.88.1.original/src/jarabe/view/keyhandler.py sugar-0.88.1/src/jarabe/view/keyhandler.py
+--- sugar-0.88.1.original/src/jarabe/view/keyhandler.py 2010-03-30 04:42:54.000000000 -0300
++++ sugar-0.88.1/src/jarabe/view/keyhandler.py 2010-09-23 15:16:05.884670602 -0300
+@@ -41,6 +41,8 @@
+ 'F2' : 'zoom_group',
+ 'F3' : 'zoom_home',
+ 'F4' : 'zoom_activity',
++ 'F5' : 'open_search',
++ 'F6' : 'frame',
+ 'XF86AudioMute' : 'volume_mute',
+ 'F11' : 'volume_down',
+ 'XF86AudioLowerVolume' : 'volume_down',
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 7b9b57e..48c46e8 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -3,7 +3,7 @@
Summary: Constructionist learning platform
Name: sugar
Version: 0.88.1
-Release: 5.36dxo%{?dist}
+Release: 5.37dxo%{?dist}
URL: http://sugarlabs.org/
Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
@@ -83,6 +83,8 @@ patch802: backup-translations.patch
Patch803: journal-0003-reindex-translations.patch
Patch804: accessibility_0009_cp_show-virtualkeyboard-for-accessibility-traslate.patch
+Patch901: add-button-frame.patch
+
License: GPLv2+
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -218,6 +220,8 @@ multiple instances of sugar.
%patch803 -p1
%patch804 -p1
+%patch901 -p1
+
%build
autoreconf
%configure