From 28b77a12fd4fab80d62987c834b3821303e4fb93 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Jul 29 2015 13:37:59 +0000 Subject: add f23 schema override --- diff --git a/cinnamon-fedora-20.gschema.override b/cinnamon-fedora-20.gschema.override deleted file mode 100644 index 1060983..0000000 --- a/cinnamon-fedora-20.gschema.override +++ /dev/null @@ -1,73 +0,0 @@ -[org.cinnamon] -desktop-effects-minimize-effect="traditional" -enabled-applets=['panel1:left:0:menu@cinnamon.org', 'panel1:left:1:show-desktop@cinnamon.org', 'panel1:left:2:panel-launchers@cinnamon.org', 'panel1:left:3:window-list@cinnamon.org', 'panel1:right:0:notifications@cinnamon.org', 'panel1:right:1:user@cinnamon.org', 'panel1:right:2:removable-drives@cinnamon.org', 'panel1:right:3:keyboard@cinnamon.org', 'panel1:right:4:network@cinnamon.org', 'panel1:right:5:sound@cinnamon.org', 'panel1:right:6:power@cinnamon.org', 'panel1:right:7:systray@cinnamon.org', 'panel1:right:8:calendar@cinnamon.org', 'panel1:right:9:windows-quick-list@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.desktop.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/images/default.png' -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.settings-daemon.peripherals.touchpad] -disable-while-typing=true -scroll-method="two-finger-scrolling" - -[org.cinnamon.theme] -name="cinnamon" diff --git a/cinnamon-fedora-21.gschema.override b/cinnamon-fedora-21.gschema.override index 5b48dce..00ef9aa 100644 --- a/cinnamon-fedora-21.gschema.override +++ b/cinnamon-fedora-21.gschema.override @@ -31,7 +31,7 @@ unplug-enabled=true unplug-file="/usr/share/cinnamon-control-center/sounds/unplug.oga" [org.cinnamon.desktop.sound] -event-sounds=false +event-sounds=true input-feedback-sounds=false volume-sound-enabled=true volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga' diff --git a/cinnamon-fedora-22.gschema.override b/cinnamon-fedora-22.gschema.override index 91eb1de..0855f61 100644 --- a/cinnamon-fedora-22.gschema.override +++ b/cinnamon-fedora-22.gschema.override @@ -31,7 +31,7 @@ unplug-enabled=true unplug-file="/usr/share/cinnamon-control-center/sounds/unplug.oga" [org.cinnamon.desktop.sound] -event-sounds=false +event-sounds=true input-feedback-sounds=false volume-sound-enabled=true volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga' diff --git a/cinnamon-fedora-23.gschema.override b/cinnamon-fedora-23.gschema.override new file mode 100644 index 0000000..de27ce8 --- /dev/null +++ b/cinnamon-fedora-23.gschema.override @@ -0,0 +1,73 @@ +[org.cinnamon] +desktop-effects-minimize-effect="traditional" +enabled-applets=['panel1:left:0:menu@cinnamon.org', 'panel1:left:1:show-desktop@cinnamon.org', 'panel1:left:2:panel-launchers@cinnamon.org', 'panel1:left:3:window-list@cinnamon.org', 'panel1:right:0:notifications@cinnamon.org', 'panel1:right:1:user@cinnamon.org', 'panel1:right:2:removable-drives@cinnamon.org', 'panel1:right:3:keyboard@cinnamon.org', 'panel1:right:4:network@cinnamon.org', 'panel1:right:5:sound@cinnamon.org', 'panel1:right:6:power@cinnamon.org', 'panel1:right:7:systray@cinnamon.org', 'panel1:right:8:calendar@cinnamon.org', 'panel1:right:9:windows-quick-list@cinnamon.org'] +favorite-apps=['firefox.desktop', 'cinnamon-settings.desktop', 'org.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=true +input-feedback-sounds=false +volume-sound-enabled=true +volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga' + +[org.cinnamon.desktop.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/f23/default/f23.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.settings-daemon.peripherals.touchpad] +disable-while-typing=true +scroll-method="two-finger-scrolling" + +[org.cinnamon.theme] +name="cinnamon" diff --git a/cinnamon.spec b/cinnamon.spec index ef65e86..8033b15 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -2,7 +2,7 @@ Name: cinnamon Version: 2.6.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: http://cinnamon.linuxmint.com @@ -14,9 +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-20.gschema.override -Source3: cinnamon-fedora-21.gschema.override -Source4: cinnamon-fedora-22.gschema.override +Source2: cinnamon-fedora-21.gschema.override +Source3: cinnamon-fedora-22.gschema.override +Source4: cinnamon-fedora-23.gschema.override Patch0: background.patch Patch1: autostart.patch @@ -215,14 +215,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} >= 22 -install -D -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora-22.gschema.override +%if 0%{?fedora} >= 23 +install -D -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora-23.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 +%if 0%{?fedora} == 22 +install -D -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora-22.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 +%if 0%{?fedora} == 21 +install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora-21.gschema.override %endif # install polkik autostart desktop file install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/applications/ @@ -282,6 +282,9 @@ fi %doc %{_datadir}/gtk-doc/html/*/ %changelog +* Wed Jul 29 2015 Leigh Scott - 2.6.13-3 +- add f23 schema override + * Mon Jul 20 2015 Leigh Scott - 2.6.13-2 - remove nautilus from menu - remove other useless crap from menu