From b3e8d2583f9cad3e84bd4225f47f8e3ce6a7f503 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Sun, 27 Nov 2016 09:00:02 -0800 Subject: Add override files to spec --- ...ect.icon-tasklist.fedora-budgie-spin.gschema.override | 2 ++ ...esktop.background.fedora-budgie-spin.gschema.override | 2 ++ ...desktop.interface.fedora-budgie-spin.gschema.override | 5 +++++ ...op.wm.preferences.fedora-budgie-spin.gschema.override | 4 ++++ ...plugins.xsettings.fedora-budgie-spin.gschema.override | 2 ++ budgie-desktop.spec | 16 +++++++++++++--- com.solus-project.icon-tasklist.gschema.override | 2 -- org.gnome.desktop.background.gschema.override | 2 -- org.gnome.desktop.interface.gschema.override | 5 ----- org.gnome.desktop.wm.preferences.gschema.override | 4 ---- ...me.settings-daemon.plugins.xsettings.gschema.override | 2 -- sources | 10 +++++----- 12 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 20_com.solus-project.icon-tasklist.fedora-budgie-spin.gschema.override create mode 100644 20_org.gnome.desktop.background.fedora-budgie-spin.gschema.override create mode 100644 20_org.gnome.desktop.interface.fedora-budgie-spin.gschema.override create mode 100644 20_org.gnome.desktop.wm.preferences.fedora-budgie-spin.gschema.override create mode 100644 20_org.gnome.settings-daemon.plugins.xsettings.fedora-budgie-spin.gschema.override delete mode 100644 com.solus-project.icon-tasklist.gschema.override delete mode 100644 org.gnome.desktop.background.gschema.override delete mode 100644 org.gnome.desktop.interface.gschema.override delete mode 100644 org.gnome.desktop.wm.preferences.gschema.override delete mode 100644 org.gnome.settings-daemon.plugins.xsettings.gschema.override diff --git a/20_com.solus-project.icon-tasklist.fedora-budgie-spin.gschema.override b/20_com.solus-project.icon-tasklist.fedora-budgie-spin.gschema.override new file mode 100644 index 0000000..349cd7f --- /dev/null +++ b/20_com.solus-project.icon-tasklist.fedora-budgie-spin.gschema.override @@ -0,0 +1,2 @@ +[com.solus-project.icon-tasklist] +pinned-launchers=['firefox.desktop','evolution.desktop','rhythmbox.desktop','shotwell.desktop','org.gnome.Nautilus.desktop',org.gnome.Software.desktop'] diff --git a/20_org.gnome.desktop.background.fedora-budgie-spin.gschema.override b/20_org.gnome.desktop.background.fedora-budgie-spin.gschema.override new file mode 100644 index 0000000..2d320a4 --- /dev/null +++ b/20_org.gnome.desktop.background.fedora-budgie-spin.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.desktop.background] +picture-uri='file:///usr/share/backgrounds/f25/default/normalish/f25.png' diff --git a/20_org.gnome.desktop.interface.fedora-budgie-spin.gschema.override b/20_org.gnome.desktop.interface.fedora-budgie-spin.gschema.override new file mode 100644 index 0000000..551bf58 --- /dev/null +++ b/20_org.gnome.desktop.interface.fedora-budgie-spin.gschema.override @@ -0,0 +1,5 @@ +[org.gnome.desktop.interface] +cursor-theme='dmz' +font-name='Roboto 11' +gtk-theme='Arc-Darker' +icon-theme='Arc' diff --git a/20_org.gnome.desktop.wm.preferences.fedora-budgie-spin.gschema.override b/20_org.gnome.desktop.wm.preferences.fedora-budgie-spin.gschema.override new file mode 100644 index 0000000..7c2566f --- /dev/null +++ b/20_org.gnome.desktop.wm.preferences.fedora-budgie-spin.gschema.override @@ -0,0 +1,4 @@ +[org.gnome.desktop.wm.preferences] +button-layout='appmenu:minimize,maximize,close' +theme='Arc-Darker' +titlebar-font='Roboto Bold 11' diff --git a/20_org.gnome.settings-daemon.plugins.xsettings.fedora-budgie-spin.gschema.override b/20_org.gnome.settings-daemon.plugins.xsettings.fedora-budgie-spin.gschema.override new file mode 100644 index 0000000..a557542 --- /dev/null +++ b/20_org.gnome.settings-daemon.plugins.xsettings.fedora-budgie-spin.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.settings-daemon.plugins.xsettings] +overrides={'Gtk/ShellShowsAppMenu': <0>} diff --git a/budgie-desktop.spec b/budgie-desktop.spec index 13d1de4..261d313 100644 --- a/budgie-desktop.spec +++ b/budgie-desktop.spec @@ -1,12 +1,17 @@ - Name: budgie-desktop Version: 10.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Modern desktop with a focus on simplicity and elegance License: GPLv2 URL: https://solus-project.com/budgie/ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source1: 20_com.solus-project.icon-tasklist.fedora-budgie-spin.gschema.override +Source2: 20_org.gnome.desktop.background.fedora-budgie-spin.gschema.override +Source3: 20_org.gnome.desktop.interface.fedora-budgie-spin.gschema.override +Source4: 20_org.gnome.desktop.wm.preferences.fedora-budgie-spin.gschema.override +Source5: 20_org.gnome.settings-daemon.plugins.xsettings.fedora-budgie-spin.gschema.override + Patch0: budgie-desktop-10.2.8-fix-desktop-specifications.patch Patch1: budgie-desktop-10.2.8-dynamic-pkgconfig-paths.patch @@ -81,6 +86,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' /usr/bin/chrpath --delete %{buildroot}%{_libdir}/libraven.so.0.0.0 /usr/bin/chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/*.so +install -Dm00644 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 %SOURCE5 %{buildroot}%{_datadir}/glib-2.0/schemas + %post /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas @@ -109,7 +116,7 @@ fi %{_libdir}/%{name}/Gvc-1.0.typelib %{_libdir}/*.so.* %{_datadir}/applications/*.desktop -%{_datadir}/glib-2.0/schemas/com.solus-project.* +%{_datadir}/glib-2.0/schemas %{_datadir}/gnome-session/sessions/%{name}.session %{_datadir}/icons/* %{_datadir}/xsessions/%{name}.desktop @@ -131,5 +138,8 @@ fi %changelog +* Sun Nov 27 2016 Link Dupont - 10.2.8-2 +- Add Fedora-specific schema overrides + * Thu Nov 10 2016 Link Dupont - 10.2.8-1 - Initial release diff --git a/com.solus-project.icon-tasklist.gschema.override b/com.solus-project.icon-tasklist.gschema.override deleted file mode 100644 index 349cd7f..0000000 --- a/com.solus-project.icon-tasklist.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[com.solus-project.icon-tasklist] -pinned-launchers=['firefox.desktop','evolution.desktop','rhythmbox.desktop','shotwell.desktop','org.gnome.Nautilus.desktop',org.gnome.Software.desktop'] diff --git a/org.gnome.desktop.background.gschema.override b/org.gnome.desktop.background.gschema.override deleted file mode 100644 index 2d320a4..0000000 --- a/org.gnome.desktop.background.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.desktop.background] -picture-uri='file:///usr/share/backgrounds/f25/default/normalish/f25.png' diff --git a/org.gnome.desktop.interface.gschema.override b/org.gnome.desktop.interface.gschema.override deleted file mode 100644 index 551bf58..0000000 --- a/org.gnome.desktop.interface.gschema.override +++ /dev/null @@ -1,5 +0,0 @@ -[org.gnome.desktop.interface] -cursor-theme='dmz' -font-name='Roboto 11' -gtk-theme='Arc-Darker' -icon-theme='Arc' diff --git a/org.gnome.desktop.wm.preferences.gschema.override b/org.gnome.desktop.wm.preferences.gschema.override deleted file mode 100644 index 7c2566f..0000000 --- a/org.gnome.desktop.wm.preferences.gschema.override +++ /dev/null @@ -1,4 +0,0 @@ -[org.gnome.desktop.wm.preferences] -button-layout='appmenu:minimize,maximize,close' -theme='Arc-Darker' -titlebar-font='Roboto Bold 11' diff --git a/org.gnome.settings-daemon.plugins.xsettings.gschema.override b/org.gnome.settings-daemon.plugins.xsettings.gschema.override deleted file mode 100644 index a557542..0000000 --- a/org.gnome.settings-daemon.plugins.xsettings.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.settings-daemon.plugins.xsettings] -overrides={'Gtk/ShellShowsAppMenu': <0>} diff --git a/sources b/sources index c7589cf..63fd7a5 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ 3647dc8103a119a4881eb567fc8c087b budgie-desktop-10.2.8.tar.xz -1d6bec967a310591c77896716e0f1682 com.solus-project.icon-tasklist.gschema.override -0581f64395fc25c59654c65165c99f56 org.gnome.desktop.background.gschema.override -ea7ce986fde20d72d4b50aa602f08c25 org.gnome.desktop.interface.gschema.override -fde83b37e27ad60f2006e5e65191facb org.gnome.desktop.wm.preferences.gschema.override -c9174cc9374ad9badb0470bcdce18f9c org.gnome.settings-daemon.plugins.xsettings.gschema.override +1d6bec967a310591c77896716e0f1682 20_com.solus-project.icon-tasklist.fedora-budgie-spin.gschema.override +0581f64395fc25c59654c65165c99f56 20_org.gnome.desktop.background.fedora-budgie-spin.gschema.override +ea7ce986fde20d72d4b50aa602f08c25 20_org.gnome.desktop.interface.fedora-budgie-spin.gschema.override +fde83b37e27ad60f2006e5e65191facb 20_org.gnome.desktop.wm.preferences.fedora-budgie-spin.gschema.override +c9174cc9374ad9badb0470bcdce18f9c 20_org.gnome.settings-daemon.plugins.xsettings.fedora-budgie-spin.gschema.override -- cgit