Hello community,
here is the log from the commit of package mate-branding-openSUSE for
openSUSE:Factory checked in at 2014-03-22 14:45:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.mate-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-branding-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mate-branding-openSUSE/mate-branding-openSUSE.changes
2013-12-30 10:22:57.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.mate-branding-openSUSE.new/mate-branding-openSUSE.changes
2014-03-22 18:02:22.000000000 +0100
@@ -1,0 +2,29 @@
+Mon Mar 17 14:31:20 UTC 2014 - [email protected]
+
+- Keep only useful stuff in mate-session-branding.gschema.override.in
+- Use sonar and gilouch as icon/theme by default to be the most closed
+ of openSUSE Gnome2 user experience
+ * define them as theme and icon theme in
+ mate-session-branding.gschema.override.in
+ * add gtk[2,3]-metatheme-sonar and require sonar-icon-theme
+ * remove mate-icon-theme requirement
+
+-------------------------------------------------------------------
+Sat Mar 15 17:08:53 UTC 2014 - [email protected]
+
+- For each branding subpackage, do not build require branded package
+ if *-branding-upstream is already build require; it's redundant
+- Fix @@WALLPAPER_URI@@ in spec file
+- Remove non-existing key entries in
+ mate-session-branding.gschema.override.in
+
+-------------------------------------------------------------------
+Sun Mar 2 15:31:58 UTC 2014 - [email protected]
+
+- Bump version to 13.2
+- Upload opensuse.layout to sources
+- Use a default layout configuration file to use gnome-main-menu by
+ default
+- Remove redundant layout install
+
+-------------------------------------------------------------------
New:
----
opensuse.layout
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.etDYLf/_old 2014-03-22 18:02:22.000000000 +0100
+++ /var/tmp/diff_new_pack.etDYLf/_new 2014-03-22 18:02:22.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mate-branding-openSUSE
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%define mate_menus_version %(rpm -q --queryformat '%%{VERSION}' mate-menus)
Name: mate-branding-openSUSE
-Version: 13.1
+Version: 13.2
Release: 0
Summary: openSUSE Branding of the Mate Desktop Environment
License: MIT
@@ -29,18 +29,15 @@
Url: http://www.mate-desktop.org/
Source1: mate-session-branding-openSUSE-mate_defaults.conf
Source2: mate-session-branding.gschema.override.in
+Source3: opensuse.layout
Patch0: mate-control-center-branding-add-YaST.patch
# PATCH-FIX-OPENSUSE mate-menus-branding-remove-X-SuSE-ControlCenter.patch
[email protected] -- Remove the desktop files with X-SuSE-YaST category from
the Applications menu and explicitly add YaST launcher
Patch1: mate-menus-branding-remove-X-SuSE-ControlCenter.patch
BuildRequires: fdupes
BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: mate-control-center
BuildRequires: mate-control-center-branding-upstream
-BuildRequires: mate-menus
BuildRequires: mate-menus-branding-upstream
-BuildRequires: mate-panel
BuildRequires: mate-panel-branding-upstream
-BuildRequires: mate-session-manager
BuildRequires: mate-session-manager-branding-upstream
BuildRequires: wallpaper-branding-openSUSE
BuildArch: noarch
@@ -89,10 +86,11 @@
Summary: openSUSE Branding of mate-session-manager
License: GPL-2.0+
Group: System/GUI/Other
-Requires: gtk2-metatheme-adwaita
-Requires: mate-icon-theme
-Requires: wallpaper-branding-openSUSE
+Requires: gtk2-metatheme-sonar
+Requires: gtk3-metatheme-sonar
Requires: mate-session-manager = %{mate_session_manager_version}
+Requires: sonar-icon-theme
+Requires: wallpaper-branding-openSUSE
Conflicts: otherproviders(mate-session-manager-branding)
Provides: mate-session-manager-branding = %{mate_session_manager_version}
Supplements: packageand(mate-session-manager:branding-openSUSE)
@@ -113,12 +111,12 @@
cp -a %{SOURCE1} mate_defaults.conf
cp -a %{SOURCE2} mate-session-branding.gschema.override.in
# Mate Panel branding part
-cp -a %{_datadir}/mate-panel/panel-default-layout.mate .
+cp -a %{SOURCE3} default.layout
%build
# Mate session manager branding part
test -f %{_datadir}/wallpapers/openSUSE-default.xml
-sed "s,@@WALLPAPER_URI@@,file:///usr/share/wallpapers/openSUSE-default.xml,"
mate-session-branding.gschema.override.in >
mate-session-branding.gschema.override
+sed
"s,@@WALLPAPER_URI@@,%{_datadir}/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg,"
mate-session-branding.gschema.override.in >
mate-session-branding.gschema.override
#for sound theme
sed "s:@@IF_openSUSE@@::g" < mate-session-branding.gschema.override | grep -v
^@@IF_ > zz-mate-session-openSUSE-branding.gschema.override
@@ -127,15 +125,13 @@
install -d %{buildroot}%{_sysconfdir}/xdg/menus
install -m0644 *.menu %{buildroot}%{_sysconfdir}/xdg/menus/
# Mate Panel branding part
-cp -a %{_datadir}/mate-panel/panel-default-layout.mate .
+install -d %{buildroot}%{_datadir}/mate-panel/
+install -m0644 default.layout %{buildroot}%{_datadir}/mate-panel/
# Mate Session Manager branding part
install -d %{buildroot}%{_sysconfdir}
install -m0644 mate_defaults.conf %{buildroot}%{_sysconfdir}/
install -d %{buildroot}%{_datadir}/glib-2.0/schemas
install -m0644 zz-mate-session-openSUSE-branding.gschema.override
%{buildroot}%{_datadir}/glib-2.0/schemas/
-# Mate Panel branding part
-install -d %{buildroot}%{_datadir}/mate-panel
-install -m0644 panel-default-layout.mate
%{buildroot}%{_datadir}/mate-panel/panel-default-layout.mate
# Remove unwanted menu file
rm -r %{buildroot}%{_sysconfdir}/xdg/menus/mate-settings.menu
@@ -149,7 +145,7 @@
%files -n mate-panel-branding-openSUSE
%defattr(-,root,root)
-%{_datadir}/mate-panel/panel-default-layout.mate
+%{_datadir}/mate-panel/default.layout
%files -n mate-session-manager-branding-openSUSE
%defattr(-,root,root)
++++++ mate-session-branding.gschema.override.in ++++++
--- /var/tmp/diff_new_pack.etDYLf/_old 2014-03-22 18:02:22.000000000 +0100
+++ /var/tmp/diff_new_pack.etDYLf/_new 2014-03-22 18:02:22.000000000 +0100
@@ -1,71 +1,10 @@
-[org.mate.desktop.interface]
-## No accessibility by default, until we're 100% there's no regression
-toolkit-accessibility = false
-### For the theme, we stay with the defaults
-## Note: for non-MATE sessions, the cursor theme is defined in
/var/adm/fillup-templates/sysconfig.windowmanager-desktop-data-openSUSE from
desktop-data-openSUSE
-# cursor-theme = ""
-
[org.mate.background]
## Default wallpaper
-picture-uri = "@@WALLPAPER_URI@@"
+picture-filename =
"/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg"
picture-options = "stretched"
primary-color = "#258c06"
secondary-color = "#258c06"
-[org.mate.desktop.screensaver]
-picture-uri = "@@WALLPAPER_URI@@"
-picture-options = "stretched"
-primary-color = "#258c06"
-secondary-color = "#258c06"
-
-[org.mate.peripherals-keyboard-xkb.general]
-## Set keyboard layout global per session instead of per window
-group-per-window = false
-
[org.mate.interface]
-icon-theme='mate'
-gtk-theme='Adwaita'
-
-[org.mate.sound]
-## Make sure to have event sounds by default
-event-sounds = true
-@@IF_openSUSE@@# theme-name = ""
-@@IF_SLE@@theme-name = "novell"
-
-[org.mate.Marco.general]
-## Audible bell is more annoying than useful
-audible-bell = false
-### For the theme, we stay with the defaults
-# titlebar-uses-system-font = false
-# titlebar-font = ""
-# theme = ""
-
-[org.mate.settings-daemon.peripherals.touchpad]
-## Enable tap-to-click by default (bnc#554884,fate#310811)
-## http://lists.opensuse.org/opensuse-factory/2012-06/msg01087.html
-tap-to-click = true
-## In order to prevent accidental clicks due to tap-to-click,
-## disable tap-to-click while typing
-disable-while-typing = true
-
-[org.mate.power-manager]
-## Enable Energy Star compliant default configuration
-sleep-display-ac = 300
-sleep-inactive-battery-type = "suspend"
-## To complete Energy Star compliant default configuration, you should enable
this too:
-## (disabled by default because suspending is not working fine in all cases)
-# sleep-inactive-ac = true
-# sleep-inactive-ac-timeout = 1200
-# sleep-inactive-battery = true
-# sleep-inactive-battery-timeout = 1200
-
-[org.mate.settings-daemon.plugins.xsettings]
-## the PackageKit gtk+ module is too spammy, fdo#23917
-disabled-gtk-modules = [ "pk-gtk-module" ]
-
-[org.mate.settings-daemon.plugins.media-keys]
-help = "XF86Help"
-
-[org.mate.mate-panel.applet.window-list]
-## Display all workspaces in the gnome-panel window list applet
-display-all-workspaces = true
+icon-theme='Gilouche'
+gtk-theme='Sonar'
++++++ opensuse.layout ++++++
[Toplevel bottom]
expand=true
orientation=bottom
size=24
[Object menu-bar]
object-type=applet
applet-iid=GNOMEMainMenuFactory::GNOMEMainMenu
toplevel-id=bottom
position=0
locked=true
[Object stickynotes]
object-type=applet
applet-iid=StickyNotesAppletFactory::StickyNotesApplet
toplevel-id=bottom
position=10
locked=true
[Object window-list]
object-type=applet
applet-iid=WnckletFactory::WindowListApplet
toplevel-id=bottom
position=20
locked=true
[Object notification-area]
object-type=applet
applet-iid=NotificationAreaAppletFactory::NotificationArea
toplevel-id=bottom
position=10
panel-right-stick=true
locked=true
[Object workspace-switcher]
object-type=applet
applet-iid=WnckletFactory::WorkspaceSwitcherApplet
toplevel-id=bottom
position=5
panel-right-stick=true
locked=true
[Object clock]
object-type=applet
applet-iid=ClockAppletFactory::ClockApplet
toplevel-id=bottom
position=0
panel-right-stick=true
locked=true
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
