[cinnamon/epel7] Add conditionals for epel7

Tue Jan 14 16:42:52 UTC 2014

commit 05dfe1393f9ef5818194666f6a8a256cc127db5b
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Jan 14 16:42:55 2014 +0000

    Add conditionals for epel7

 cinnamon-redhat.gschema.override |   61 ++++++++++++++++++++++++++++++++++++++
 cinnamon.spec                    |   24 +++++++++++----
 2 files changed, 79 insertions(+), 6 deletions(-)
---

diff --git a/cinnamon-redhat.gschema.override b/cinnamon-redhat.gschema.override
new file mode 100644
index 0000000..b0d003f
--- /dev/null
+++ b/cinnamon-redhat.gschema.override
@@ -0,0 +1,61 @@
+[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
+panel-launchers=['firefox.desktop', 'mozilla-thunderbird.desktop', 'gnome-terminal.desktop', 'nemo.desktop']
+workspace-expo-view-as-grid=true
+
+[org.cinnamon.sounds]
+login-enabled=true
+login-file="/usr/share/cinnamon-control-center/sounds/login.oga"
+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/images/default.png'
+primary-color='#023c88'
+secondary-color='#5789ca'
+
+[org.cinnamon.desktop.interface]
+menus-have-icons=true
+font-name='Cantarell 11'
+
+[org.cinnamon.desktop.wm.preferences]
+button-layout=':minimize,maximize,close'
+titlebar-font='Cantarell Bold 11'
+
+[org.cinnamon.settings-daemon.plugins.xsettings]
+hinting="slight"
+menus-have-icons=true
+
+[org.cinnamon.settings-daemon.plugins.power]
+lock-on-suspend=true
diff --git a/cinnamon.spec b/cinnamon.spec
index f1df9bf..4a9e52b 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon
 Version:        2.0.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -15,6 +15,7 @@ Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/Cinnamo
 Source1:        cinnamon-fedora.gschema.override
 Source2:        org.cinnamon.settings-users.policy
 Source3:        polkit-cinnamon-authentication-agent-1.desktop
+Source4:        cinnamon-redhat.gschema.override
 
 Patch0:         background.patch
 Patch1:         autostart.patch
@@ -58,10 +59,12 @@ BuildRequires:  pkgconfig(libsoup-2.4)
 BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libmuffin) >= %{muffin_version}
 BuildRequires:  pkgconfig(libpulse)
+%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 20)
 %ifnarch s390 s390x
 BuildRequires:  pkgconfig(gnome-bluetooth-1.0) >= 2.91
 BuildRequires:  gnome-bluetooth >= 2.91
 %endif
+%endif
 # Bootstrap requirements
 BuildRequires:  pkgconfig(gtk-doc) 
 BuildRequires:  gnome-common
@@ -111,15 +114,17 @@ Requires:       cinnamon-screensaver
 
 # metacity is needed for fallback
 Requires:       metacity
+%if 0%{?fedora}
 Requires:       tint2
 
 # needed for theme overrides
 Requires:       zukitwo-gtk2-theme
 Requires:       zukitwo-gtk3-theme
 Requires:       gnome-themes
+%endif
 
 # re-add bluetooth support for F19
-%if 0%{?fedora} < 20
+%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 20)
 Requires:       blueman
 %endif
 
@@ -147,14 +152,14 @@ The emphasis is put on making users feel at home and providing
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%if 0%{?fedora} < 20
+%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 20)
 %patch6 -p1
 %endif
 %patch7 -p1
 %if 0%{?fedora} > 20
 %patch8 -p1
 %endif
-%if 0%{?fedora} > 19
+%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} > 19)
 %patch9 -p1
 %endif
 NOCONFIGURE=1 ./autogen.sh
@@ -175,8 +180,11 @@ make %{?_smp_mflags} V=1
 # Remove .la file
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/cinnamon/libcinnamon.la
 
+%if 0%{?fedora}
 install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
-
+%else
+install -D -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/cinnamon-redhat.gschema.override
+%endif
 # install polkik autostart desktop file
 install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/applications/
 
@@ -197,7 +205,7 @@ desktop-file-install                                 \
  $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-settings.desktop
 
 # fix hard coded path
-%ifarch x86_64
+%ifarch x86_64 ppc64
 sed -i -e 's@/usr/lib/cinnamon-control-center@/usr/lib64/cinnamon-control-center at g' \
 $RPM_BUILD_ROOT/%{_prefix}/lib/cinnamon-settings/bin/capi.py
 %endif
@@ -237,6 +245,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 14 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.0.14-8
+- Add conditionals for epel7
+- Add redhat overrides schema file
+
 * Sun Dec 22 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.14-7
 - Remove bluetooth for F20 as well
 
