leigh123linux pushed to cinnamon (f22). "tweak schema overrides"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Apr 25 10:22:41 UTC 2015 

>From c9cbb0bb9c1070d04b46e7ce39e8e621ab6075b1 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Sat, 25 Apr 2015 11:21:29 +0100
Subject: tweak schema overrides


diff --git a/cinnamon-fedora-21.gschema.override b/cinnamon-fedora-21.gschema.override
new file mode 100644
index 0000000..1ce81fa
--- /dev/null
+++ b/cinnamon-fedora-21.gschema.override
@@ -0,0 +1,69 @@
+[org.cinnamon]
+desktop-effects-minimize-effect="traditional"
+enabled-applets=['panel1:left:0:menu at cinnamon.org', 'panel1:left:1:show-desktop at cinnamon.org', 'panel1:left:2:panel-launchers at cinnamon.org', 'panel1:left:3:window-list at cinnamon.org', 'panel1:right:0:notifications at cinnamon.org', 'panel1:right:1:user at cinnamon.org', 'panel1:right:2:removable-drives at cinnamon.org', 'panel1:right:3:keyboard at cinnamon.org', 'panel1:right:4:network at cinnamon.org', 'panel1:right:5:sound at cinnamon.org', 'panel1:right:6:power at cinnamon.org', 'panel1:right:7:systray at cinnamon.org', 'panel1:right:8:calendar at cinnamon.org', 'panel1:right:9:windows-quick-list at cinnamon.org']
+favorite-apps=['firefox.desktop', 'cinnamon-settings.desktop', 'gnome-terminal.desktop', 'nemo.desktop']
+number-workspaces=4
+startup-animation=false
+workspace-expo-view-as-grid=true
+
+[org.cinnamon.sounds]
+login-enabled=true
+login-file="/usr/share/cinnamon-control-center/sounds/login.oga"
+logout-enabled=true
+logout-file="/usr/share/cinnamon-control-center/sounds/logout.ogg"
+switch-enabled=true
+switch-file="/usr/share/cinnamon-control-center/sounds/switch.oga"
+close-enabled=true
+close-file="/usr/share/cinnamon-control-center/sounds/close.oga"
+map-enabled=true
+map-file="/usr/share/cinnamon-control-center/sounds/map.oga"
+minimize-enabled=true
+minimize-file="/usr/share/cinnamon-control-center/sounds/minimize.oga"
+maximize-enabled=true
+maximize-file="/usr/share/cinnamon-control-center/sounds/maximize.oga"
+unmaximize-enabled=true
+unmaximize-file="/usr/share/cinnamon-control-center/sounds/unmaximize.oga"
+tile-enabled=true
+tile-file="/usr/share/cinnamon-control-center/sounds/tile.oga"
+plug-enabled=true
+plug-file="/usr/share/cinnamon-control-center/sounds/plug.oga"
+unplug-enabled=true
+unplug-file="/usr/share/cinnamon-control-center/sounds/unplug.oga"
+
+[org.cinnamon.desktop.sound]
+event-sounds=false
+input-feedback-sounds=false
+volume-sound-enabled=true
+volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga'
+
+[org.cinnamon.screensaver]
+ask-for-away-message=false
+
+[org.cinnamon.settings-daemon.peripherals.keyboard]
+input-sources-switcher='alt-shift'
+
+[org.cinnamon.desktop.background]
+picture-uri='file:///usr/share/backgrounds/f21/default/f21.xml'
+primary-color='#023c88'
+secondary-color='#5789ca'
+
+[org.cinnamon.desktop.interface]
+menus-have-icons=true
+font-name='Cantarell 11'
+gtk-theme='Zukitwo'
+icon-theme='nimbus'
+
+[org.cinnamon.desktop.wm.preferences]
+button-layout=':minimize,maximize,close'
+titlebar-font='Cantarell Bold 11'
+theme='Clearlooks'
+
+[org.cinnamon.settings-daemon.plugins.xsettings]
+hinting="slight"
+menus-have-icons=true
+
+[org.cinnamon.settings-daemon.plugins.power]
+lock-on-suspend=true
+
+[org.cinnamon.theme]
+name="cinnamon"
diff --git a/cinnamon-fedora-22.gschema.override b/cinnamon-fedora-22.gschema.override
new file mode 100644
index 0000000..df1ce5f
--- /dev/null
+++ b/cinnamon-fedora-22.gschema.override
@@ -0,0 +1,69 @@
+[org.cinnamon]
+desktop-effects-minimize-effect="traditional"
+enabled-applets=['panel1:left:0:menu at cinnamon.org', 'panel1:left:1:show-desktop at cinnamon.org', 'panel1:left:2:panel-launchers at cinnamon.org', 'panel1:left:3:window-list at cinnamon.org', 'panel1:right:0:notifications at cinnamon.org', 'panel1:right:1:user at cinnamon.org', 'panel1:right:2:removable-drives at cinnamon.org', 'panel1:right:3:keyboard at cinnamon.org', 'panel1:right:4:network at cinnamon.org', 'panel1:right:5:sound at cinnamon.org', 'panel1:right:6:power at cinnamon.org', 'panel1:right:7:systray at cinnamon.org', 'panel1:right:8:calendar at cinnamon.org', 'panel1:right:9:windows-quick-list at cinnamon.org']
+favorite-apps=['firefox.desktop', 'cinnamon-settings.desktop', 'gnome-terminal.desktop', 'nemo.desktop']
+number-workspaces=4
+startup-animation=false
+workspace-expo-view-as-grid=true
+
+[org.cinnamon.sounds]
+login-enabled=true
+login-file="/usr/share/cinnamon-control-center/sounds/login.oga"
+logout-enabled=true
+logout-file="/usr/share/cinnamon-control-center/sounds/logout.ogg"
+switch-enabled=true
+switch-file="/usr/share/cinnamon-control-center/sounds/switch.oga"
+close-enabled=true
+close-file="/usr/share/cinnamon-control-center/sounds/close.oga"
+map-enabled=true
+map-file="/usr/share/cinnamon-control-center/sounds/map.oga"
+minimize-enabled=true
+minimize-file="/usr/share/cinnamon-control-center/sounds/minimize.oga"
+maximize-enabled=true
+maximize-file="/usr/share/cinnamon-control-center/sounds/maximize.oga"
+unmaximize-enabled=true
+unmaximize-file="/usr/share/cinnamon-control-center/sounds/unmaximize.oga"
+tile-enabled=true
+tile-file="/usr/share/cinnamon-control-center/sounds/tile.oga"
+plug-enabled=true
+plug-file="/usr/share/cinnamon-control-center/sounds/plug.oga"
+unplug-enabled=true
+unplug-file="/usr/share/cinnamon-control-center/sounds/unplug.oga"
+
+[org.cinnamon.desktop.sound]
+event-sounds=false
+input-feedback-sounds=false
+volume-sound-enabled=true
+volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga'
+
+[org.cinnamon.screensaver]
+ask-for-away-message=false
+
+[org.cinnamon.settings-daemon.peripherals.keyboard]
+input-sources-switcher='alt-shift'
+
+[org.cinnamon.desktop.background]
+picture-uri='file:///usr/share/backgrounds/f22/default/f22.xml'
+primary-color='#023c88'
+secondary-color='#5789ca'
+
+[org.cinnamon.desktop.interface]
+menus-have-icons=true
+font-name='Cantarell 11'
+gtk-theme='Zukitwo'
+icon-theme='nimbus'
+
+[org.cinnamon.desktop.wm.preferences]
+button-layout=':minimize,maximize,close'
+titlebar-font='Cantarell Bold 11'
+theme='Zukitwo'
+
+[org.cinnamon.settings-daemon.plugins.xsettings]
+hinting="slight"
+menus-have-icons=true
+
+[org.cinnamon.settings-daemon.plugins.power]
+lock-on-suspend=true
+
+[org.cinnamon.theme]
+name="cinnamon"
diff --git a/cinnamon-fedora.gschema.override b/cinnamon-fedora.gschema.override
deleted file mode 100644
index 1ce81fa..0000000
--- a/cinnamon-fedora.gschema.override
+++ /dev/null
@@ -1,69 +0,0 @@
-[org.cinnamon]
-desktop-effects-minimize-effect="traditional"
-enabled-applets=['panel1:left:0:menu at cinnamon.org', 'panel1:left:1:show-desktop at cinnamon.org', 'panel1:left:2:panel-launchers at cinnamon.org', 'panel1:left:3:window-list at cinnamon.org', 'panel1:right:0:notifications at cinnamon.org', 'panel1:right:1:user at cinnamon.org', 'panel1:right:2:removable-drives at cinnamon.org', 'panel1:right:3:keyboard at cinnamon.org', 'panel1:right:4:network at cinnamon.org', 'panel1:right:5:sound at cinnamon.org', 'panel1:right:6:power at cinnamon.org', 'panel1:right:7:systray at cinnamon.org', 'panel1:right:8:calendar at cinnamon.org', 'panel1:right:9:windows-quick-list at cinnamon.org']
-favorite-apps=['firefox.desktop', 'cinnamon-settings.desktop', 'gnome-terminal.desktop', 'nemo.desktop']
-number-workspaces=4
-startup-animation=false
-workspace-expo-view-as-grid=true
-
-[org.cinnamon.sounds]
-login-enabled=true
-login-file="/usr/share/cinnamon-control-center/sounds/login.oga"
-logout-enabled=true
-logout-file="/usr/share/cinnamon-control-center/sounds/logout.ogg"
-switch-enabled=true
-switch-file="/usr/share/cinnamon-control-center/sounds/switch.oga"
-close-enabled=true
-close-file="/usr/share/cinnamon-control-center/sounds/close.oga"
-map-enabled=true
-map-file="/usr/share/cinnamon-control-center/sounds/map.oga"
-minimize-enabled=true
-minimize-file="/usr/share/cinnamon-control-center/sounds/minimize.oga"
-maximize-enabled=true
-maximize-file="/usr/share/cinnamon-control-center/sounds/maximize.oga"
-unmaximize-enabled=true
-unmaximize-file="/usr/share/cinnamon-control-center/sounds/unmaximize.oga"
-tile-enabled=true
-tile-file="/usr/share/cinnamon-control-center/sounds/tile.oga"
-plug-enabled=true
-plug-file="/usr/share/cinnamon-control-center/sounds/plug.oga"
-unplug-enabled=true
-unplug-file="/usr/share/cinnamon-control-center/sounds/unplug.oga"
-
-[org.cinnamon.desktop.sound]
-event-sounds=false
-input-feedback-sounds=false
-volume-sound-enabled=true
-volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga'
-
-[org.cinnamon.screensaver]
-ask-for-away-message=false
-
-[org.cinnamon.settings-daemon.peripherals.keyboard]
-input-sources-switcher='alt-shift'
-
-[org.cinnamon.desktop.background]
-picture-uri='file:///usr/share/backgrounds/f21/default/f21.xml'
-primary-color='#023c88'
-secondary-color='#5789ca'
-
-[org.cinnamon.desktop.interface]
-menus-have-icons=true
-font-name='Cantarell 11'
-gtk-theme='Zukitwo'
-icon-theme='nimbus'
-
-[org.cinnamon.desktop.wm.preferences]
-button-layout=':minimize,maximize,close'
-titlebar-font='Cantarell Bold 11'
-theme='Clearlooks'
-
-[org.cinnamon.settings-daemon.plugins.xsettings]
-hinting="slight"
-menus-have-icons=true
-
-[org.cinnamon.settings-daemon.plugins.power]
-lock-on-suspend=true
-
-[org.cinnamon.theme]
-name="cinnamon"
diff --git a/cinnamon.spec b/cinnamon.spec
index e9c3d2c..edbe7a7 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon
 Version:        2.4.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -14,8 +14,9 @@ URL:            http://cinnamon.linuxmint.com
 #Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon/source/cinnamon-%%{version}.git%%{_internal_version}.tar.gz
 Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/Cinnamon-%{version}.tar.gz
 Source1:        polkit-cinnamon-authentication-agent-1.desktop
-Source2:        cinnamon-fedora.gschema.override
-Source3:        cinnamon-fedora-20.gschema.override
+Source2:        cinnamon-fedora-20.gschema.override
+Source3:        cinnamon-fedora-21.gschema.override
+Source4:        cinnamon-fedora-22.gschema.override
 
 Patch0:         background.patch
 Patch1:         autostart.patch
@@ -199,10 +200,14 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cinnamon/libcinnamon.la
 # remove backup files
 find $RPM_BUILD_ROOT -name '*.orig' -exec rm -f {} \;
 
-%if 0%{?fedora} > 20
-install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
-%else
-install -D -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora-20.gschema.override
+%if 0%{?fedora} == 22
+install -D -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora-22.gschema.override
+%endif
+%if 0%{?fedora} == 21
+install -D -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora-21.gschema.override
+%endif
+%if 0%{?fedora} == 20
+install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora-20.gschema.override
 %endif
 # install polkik autostart desktop file
 install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/applications/
@@ -257,6 +262,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sat Apr 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.7-2
+- tweak schema overrides
+
 * Thu Apr 02 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.7-1
 - update to 2.4.7
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cinnamon.git/commit/?h=f22&id=c9cbb0bb9c1070d04b46e7ce39e8e621ab6075b1

More information about the scm-commits mailing list