[cinnamon] fix input-source-switcher autostart
leigh123linux
leigh123linux at fedoraproject.org
Wed Jul 10 18:47:22 UTC 2013
commit 72da3996c189f4590b3a1e8acdfc5a361c37b9db
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Wed Jul 10 19:47:12 2013 +0100
fix input-source-switcher autostart
autostart_nemo.patch | 4 ++--
cinnamon.spec | 12 +++++++++++-
input-source-switcher.desktop | 6 ++++++
3 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/autostart_nemo.patch b/autostart_nemo.patch
index 1427d7e..071a7c2 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;gsd-input-sources-switcher;
++RequiredComponents=cinnamon;gnome-settings-daemon;nemo-autostart;cinnamon-screensaver;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
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;gsd-input-sources-switcher;
++RequiredComponents=cinnamon2d;gnome-settings-daemon;nemo-autostart;cinnamon2d-screensaver;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
DesktopName=GNOME
diff --git a/cinnamon.spec b/cinnamon.spec
index a95946d..659b78f 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,6 +1,6 @@
Name: cinnamon
Version: 1.9.1
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+ and LGPLv2+
URL: http://cinnamon.linuxmint.com
@@ -12,6 +12,7 @@ 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-1.tar.xz
+Source5: input-source-switcher.desktop
Patch0: gnome-3.8-compat.patch
Patch1: background.patch
@@ -173,6 +174,11 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinna
# Add autostart files for gnome-screensaver
install -pm 0644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/applications/
+# Add autostart files for input-source-switcher
+install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/
+install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/
+
+desktop-file-validate $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/input-source-switcher.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
@@ -205,6 +211,7 @@ fi
%doc COPYING README
%{_bindir}/*
%{_sysconfdir}/xdg/menus/*
+%{_sysconfdir}/xdg/autostart/*
%{_datadir}/applications/*
%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
%{_datadir}/desktop-directories/*
@@ -220,6 +227,9 @@ fi
%{_mandir}/man1/*
%changelog
+* Wed Jul 10 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-15
+- fix input-source-switcher autostart
+
* Wed Jul 10 2013 leigh scott <leigh123linux at googlemail.com> - 1.9.1-14
- fix input-source-switcher
diff --git a/input-source-switcher.desktop b/input-source-switcher.desktop
new file mode 100644
index 0000000..a574582
--- /dev/null
+++ b/input-source-switcher.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=input sources switcher
+Comment=Launch input sources switcher for Cinnamon
+Exec=/usr/libexec/cinnamon/gsd-input-sources-switcher
+OnlyShowIn=GNOME;
More information about the scm-commits
mailing list