[cinnamon/f19] fix input-source-switcher

leigh123linux leigh123linux at fedoraproject.org
Wed Jul 10 18:02:59 UTC 2013 

commit 77bc822cfc7d66c190ce73bc21b8a8d3d4d99154
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jul 10 19:02:50 2013 +0100

    fix input-source-switcher

 autostart_nemo.patch             |    4 +-
 cinnamon-fedora.gschema.override |    3 +-
 cinnamon.spec                    |   39 +++++++++++++++++++++++--------------
 3 files changed, 28 insertions(+), 18 deletions(-)
---
diff --git a/autostart_nemo.patch b/autostart_nemo.patch
index 071a7c2..77c43d9 100644
--- a/autostart_nemo.patch
+++ b/autostart_nemo.patch
@@ -4,7 +4,7 @@
  [GNOME Session]
  Name=Cinnamon
 -RequiredComponents=cinnamon;gnome-settings-daemon;
-+RequiredComponents=cinnamon;gnome-settings-daemon;nemo-autostart;cinnamon-screensaver;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
++RequiredComponents=cinnamon;gnome-settings-daemon;nemo-autostart;cinnamon-screensaver;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;gsd-input-sources-switcher;
  DesktopName=GNOME
  
 --- a/files/usr/share/gnome-session/sessions/cinnamon2d.session
@@ -13,6 +13,6 @@
  [GNOME Session]
  Name=Cinnamon (Software Rendering)
 -RequiredComponents=cinnamon2d;gnome-settings-daemon;
-+RequiredComponents=cinnamon2d;gnome-settings-daemon;nemo-autostart;cinnamon2d-screensaver;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
++RequiredComponents=cinnamon;gnome-settings-daemon;nemo-autostart;cinnamon-screensaver;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;gsd-input-sources-switcher;
  DesktopName=GNOME
  
diff --git a/cinnamon-fedora.gschema.override b/cinnamon-fedora.gschema.override
index 3e14157..17db247 100644
--- a/cinnamon-fedora.gschema.override
+++ b/cinnamon-fedora.gschema.override
@@ -11,4 +11,5 @@ panel-launchers=['firefox.desktop', 'mozilla-thunderbird.desktop', 'gnome-termin
 [org.cinnamon.background]
 picture-uri='file:///usr/share/backgrounds/images/default.png'
 
-
+[org.gnome.settings-daemon.peripherals.keyboard]
+input-sources-switcher='alt-shift'
diff --git a/cinnamon.spec b/cinnamon.spec
index 6fc5a33..ce47b36 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,6 +1,6 @@
 Name:           cinnamon
 Version:        1.9.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -11,7 +11,7 @@ Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/%{name}
 Source1:        cinnamon-fedora.gschema.override
 Source2:        cinnamon-screensaver.desktop
 Source3:        cinnamon2d-screensaver.desktop
-Source4:        http://leigh123linux.fedorapeople.org/pub/gnome-settings-daemon-compat/source/gnome-settings-daemon-compat-3.6.4.tar.xz
+Source4:        http://leigh123linux.fedorapeople.org/pub/gnome-settings-daemon-compat/source/gnome-settings-daemon-compat-3.6.4-1.tar.xz
 
 Patch0:         gnome-3.8-compat.patch
 Patch1:         background.patch
@@ -119,7 +119,7 @@ The emphasis is put on making users feel at home and providing
  them with an easy to use and comfortable desktop experience.
 
 %prep
-%setup -q -T -b4 -n gnome-settings-daemon-compat-3.6.4
+%setup -q -T -b4 -n gnome-settings-daemon-compat-3.6.4-1
 %setup -q -n Cinnamon-%{version}
 %patch0 -p1
 %patch1 -p1
@@ -147,6 +147,7 @@ autoreconf -fi
  --disable-cups --disable-smartcard-support --disable-packagekit
 make %{?_smp_mflags} V=1 -C plugins/common
 make %{?_smp_mflags} V=1 -C plugins/media-keys
+make %{?_smp_mflags} V=1 -C plugins/keyboard
 make %{?_smp_mflags} V=1 -C plugins/automount
 
 %install
@@ -154,25 +155,30 @@ make %{?_smp_mflags} V=1 -C plugins/automount
 
 pushd ../gnome-settings-daemon-compat-3.6.4
 %{make_install} -C plugins/media-keys INSTALL='install -p'
+%{make_install} -C plugins/keyboard INSTALL='install -p'
 %{make_install} -C plugins/automount INSTALL='install -p'
 popd
 
 # Remove .la file
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/cinnamon/libcinnamon.la
 
-install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
+# Remove the unwanted keyboard bits
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnome-settings-daemon-3.0/
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gnome-settings-daemon/
+
+install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
 
 # Add autostart files for gnome-screensaver
-install -pm 0644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/applications/
+install -pm 0644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/applications/
 
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon2d.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-add-panel-launcher.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-menu-editor.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-screensaver.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon2d-screensaver.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-fallback-media-keys-helper.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-fallback-mount-helper.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon2d.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-add-panel-launcher.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-menu-editor.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-screensaver.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon2d-screensaver.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-fallback-media-keys-helper.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-fallback-mount-helper.desktop
 
 desktop-file-install                                 \
  --add-category="Utility"                            \
@@ -180,8 +186,8 @@ desktop-file-install                                 \
  --remove-key="Encoding"                             \
  --add-only-show-in="GNOME"                          \
  --delete-original                                   \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications       \
- $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-settings.desktop
+ --dir=$RPM_BUILD_ROOT/%{_datadir}/applications       \
+ $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-settings.desktop
 
 %find_lang %{name}
 
@@ -212,6 +218,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 10 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-14
+- fix input-source-switcher
+
 * Fri Jun 14 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-13
 - spec file clean up

More information about the scm-commits mailing list