Hello community,

here is the log from the commit of package mate-branding-openSUSE for 
openSUSE:Factory checked in at 2013-12-30 10:22:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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:
--------
New Changes file:

--- /dev/null   2013-11-25 01:44:08.036031256 +0100
+++ 
/work/SRC/openSUSE:Factory/.mate-branding-openSUSE.new/mate-branding-openSUSE.changes
       2013-12-30 10:22:57.000000000 +0100
@@ -0,0 +1,43 @@
+-------------------------------------------------------------------
+Thu Dec 19 14:04:05 UTC 2013 - [email protected]
+
+- Add mate-menus-branding-remove-X-SuSE-ControlCenter.patch: this
+  removes the desktop files with X-SuSE-ControlCenter-* categories
+  from the Applications menu. They should just appear in the
+  control center.
+
+-------------------------------------------------------------------
+Wed Dec 18 16:15:30 UTC 2013 - [email protected]
+
+- Change license to MIT; GPL licenses require to provide a COPYING
+  file
+
+-------------------------------------------------------------------
+Sat Oct  5 13:50:46 UTC 2013 - [email protected]
+
+- Remove Novell license file; it doesn't meaning nothing to provide it
+- Fix Summary main package; replace xcfe with Mate
+- Remove useless Obsoletes tags for mate-session-manager branding package
+
+-------------------------------------------------------------------
+Mon Sep 23 21:53:50 UTC 2013 - [email protected]
+
+- Set the same background for the lockscreen by default as we use
+  as regular background. 
+
+-------------------------------------------------------------------
+Fri Sep 20 15:14:35 UTC 2013 - [email protected]
+
+- Remove toggle-mute from overrides; not in Mate schema
+
+-------------------------------------------------------------------
+Tue Aug 13 17:44:30 UTC 2013 - [email protected]
+
+- Remove org.freedesktop.Tracker.Miner.Files entry from override file
+  don't define it here
+
+-------------------------------------------------------------------
+Sat Mar 23 15:03:01 UTC 2013 - [email protected]
+
+- Initial release
+

New:
----
  mate-branding-openSUSE.changes
  mate-branding-openSUSE.spec
  mate-control-center-branding-add-YaST.patch
  mate-menus-branding-remove-X-SuSE-ControlCenter.patch
  mate-session-branding-openSUSE-mate_defaults.conf
  mate-session-branding.gschema.override.in

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mate-branding-openSUSE.spec ++++++
#
# spec file for package mate-branding-openSUSE
#
# Copyright (c) 2013 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

%define mate_panel_version %(rpm -q --queryformat '%%{VERSION}' mate-panel)
%define mate_session_manager_version %(rpm -q --queryformat '%%{VERSION}' 
mate-session-manager)
%define mate_control_center_version %(rpm -q --queryformat '%%{VERSION}' 
mate-control-center)
%define mate_menus_version %(rpm -q --queryformat '%%{VERSION}' mate-menus)

Name:           mate-branding-openSUSE
Version:        13.1
Release:        0
Summary:        openSUSE Branding of the Mate Desktop Environment
License:        MIT
Group:          System/GUI/Other
Url:            http://www.mate-desktop.org/
Source1:        mate-session-branding-openSUSE-mate_defaults.conf
Source2:        mate-session-branding.gschema.override.in
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

%description
This package provides the openSUSE look and feel for the Mate desktop 
environment.

%package -n mate-control-center-branding-openSUSE
Summary:        openSUSE Branding of mate-control-center
License:        GPL-2.0+
Group:          System/GUI/Other
Requires:       mate-control-center = %{mate_control_center_version}
Conflicts:      otherproviders(mate-control-center-branding)
Provides:       mate-control-center-branding = %{mate_control_center_version}
Supplements:    packageand(mate-control-center:branding-openSUSE)

%description -n mate-control-center-branding-openSUSE
This package provides the openSUSE definition of what appears in the
control center.

%package -n mate-panel-branding-openSUSE
Summary:        openSUSE Branding of mate-panel
License:        GPL-2.0+
Group:          System/GUI/Other
Requires:       mate-panel = %{mate_panel_version}
Conflicts:      otherproviders(mate-panel-branding)
Provides:       mate-panel-branding = %{mate_panel_version}
Supplements:    packageand(mate-panel:branding-openSUSE)

%description -n mate-panel-branding-openSUSE
This package provides the openSUSE look and feel for the Mate Panel.

%package -n mate-menus-branding-openSUSE
Summary:        openSUSE Branding of mate-menus
License:        GPL-2.0+
Group:          System/GUI/Other
Requires:       mate-menus = %{mate_menus_version}
Conflicts:      otherproviders(mate-menus-branding)
Provides:       mate-menus-branding = %{mate_menus_version}
Supplements:    packageand(mate-menus:branding-openSUSE)

%description -n mate-menus-branding-openSUSE
This package provides the openSUSE definitions for menus.

%package -n mate-session-manager-branding-openSUSE
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:       mate-session-manager = %{mate_session_manager_version}
Conflicts:      otherproviders(mate-session-manager-branding)
Provides:       mate-session-manager-branding = %{mate_session_manager_version}
Supplements:    packageand(mate-session-manager:branding-openSUSE)
%glib2_gsettings_schema_requires

%description -n mate-session-manager-branding-openSUSE
This package provides the openSUSE look and feel for the Mate Session Manager.

%prep
%setup -q -T -c %{name}-%{version}
# Mate Control Center branding part
# We will base the shell content on upstream content:
cp -a %{_sysconfdir}/xdg/menus/*.menu .
%patch0 -p0
# Mate Menus branding part
%patch1 -p0
# Mate Session Manager branding part
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 .

%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
#for sound theme
sed "s:@@IF_openSUSE@@::g" < mate-session-branding.gschema.override | grep -v 
^@@IF_ > zz-mate-session-openSUSE-branding.gschema.override

%install
# Mate Control Center branding part
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 .
# 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

%files -n mate-control-center-branding-openSUSE
%defattr (-, root, root)
%config %{_sysconfdir}/xdg/menus/matecc.menu

%files -n mate-menus-branding-openSUSE
%defattr(-,root,root)
%config %{_sysconfdir}/xdg/menus/mate-applications.menu

%files -n mate-panel-branding-openSUSE
%defattr(-,root,root)
%{_datadir}/mate-panel/panel-default-layout.mate

%files -n mate-session-manager-branding-openSUSE
%defattr(-,root,root)
%config (noreplace) %{_sysconfdir}/mate_defaults.conf
%{_datadir}/glib-2.0/schemas/zz-mate-session-openSUSE-branding.gschema.override

%changelog
++++++ mate-control-center-branding-add-YaST.patch ++++++
--- matecc.menu 2013-02-27 19:46:41.015149792 +0800
+++ matecc-new.menu     2013-02-27 19:47:32.204147962 +0800
@@ -94,6 +94,8 @@
           <Category>X-MATE-SystemSettings</Category>
           <And>
             <Category>System</Category>
+          <And>
+            <Filename>YaST.desktop</Filename>
             <Not>
               <Or>
                 <Category>X-MATE-PersonalSettings</Category>
@@ -103,6 +105,7 @@
               </Or>
             </Not>
           </And>
+          </And>
         </Or>
       </And>
     </Include>
++++++ mate-menus-branding-remove-X-SuSE-ControlCenter.patch ++++++
--- mate-applications.menu.orig 2012-10-11 10:26:03.000000000 +0200
+++ mate-applications.menu      2013-02-22 19:05:24.921498626 +0100
@@ -134,6 +134,7 @@
         <Category>System</Category>
         <Not><Category>Settings</Category></Not>
       </And>
+      <Filename>YaST.desktop</Filename>
     </Include>
   </Menu>   <!-- End System Tools -->
 
@@ -147,6 +148,7 @@
         <Not><Category>Core</Category></Not>
         <Not><Category>Settings</Category></Not>
         <Not><Category>Screensaver</Category></Not>
+        <Not><Category>X-SuSE-YaST</Category></Not>
       </And>
     </Include>
   </Menu> <!-- End Other -->
   ++++++ mate-session-branding-openSUSE-mate_defaults.conf ++++++
# MATE Default Applications Source
# /etc/mate-defaults.conf
#
# After any change of this file run
# suse-update-mime-defaults
#
# This list is a source for defaults.list.
#
# If application in this list is installed, it is used as default in MATE.
# It works in following way:
# 1. Read this file.
# 2. Collect all available desktop files.
# 3. Go through all declared MIME types and search for default application
#    for defaults.list in following order:
# 3.1 Installed application listed here for certain MIME type.
# 3.2 Installed application listed here as preferred default.
# 3.3 Installed application listed here as default.
# 3.4 Installed application with MATE in Categories.
# 3.5 Installed application with GTK in Categories.
# 3.6 Installed application.
# If there are more applications in the same order, it uses pseudo-randomly
# one of them (last in aplhabetical order).
#
# Syntax:
# Use xxx as default for all MIME types it declares (see 3.3):
# xxx.desktop
# Use xxx as preferred default for all MIME types it declares (see 3.2):
# !xxx.desktop
# Use xxx as default for mime/type (see 3.1):
# mime/type=xxx.desktop

# URI schemes
x-scheme-handler/http=firefox.desktop
x-scheme-handler/https=firefox.desktop
x-scheme-handler/ftp=firefox.desktop
x-scheme-handler/mailto=evolution.desktop
# All URI schemes declared by yelp
yelp.desktop

# Prefer banshee for multimedia where possible
!banshee-1.desktop

# Except prefer moonshine for WM
video/x-ms-asf-plugin=moonshine.desktop
video/x-msvideo=moonshine.desktop
video/x-ms-asf=moonshine.desktop
video/x-ms-wmv=moonshine.desktop
video/x-wmv=moonshine.desktop
video/x-ms-wvx=moonshine.desktop
video/x-ms-wm=moonshine.desktop
video/x-ms-wmp=moonshine.desktop
application/x-ms-wms=moonshine.desktop
application/x-ms-wmp=moonshine.desktop
application/asx=moonshine.desktop
audio/x-ms-wma=moonshine.desktop

# Prefer LinDVD for DVD and mpeg video playback, when available
video/mpeg=LinDVD.desktop
video/x-mpeg=LinDVD.desktop
video/dvd=LinDVD.desktop
x-content/video-dvd=LinDVD.desktop

# Prefer contracted commercial applications
!flashplayer.desktop
!acroread.desktop
realplay.desktop

# Prefer Install Software over file-roller
application/x-rpm=package-manager.desktop
!gpk-install-file.desktop

# Nice MATE default applications
eom.desktop
atril.desktop
pluma.desktop
engrampa.desktop
# engrampa supports iso, but most people will prefer brasero:
application/x-cd-image=brasero.desktop
caja-folder-handler.desktop
# atril supports multi-page tiff, but most people will prefer eom:
image/tiff=eom.desktop
# atril supports odp, but we really want OOo
application/vnd.sun.xml.impress=impress.desktop
application/vnd.oasis.opendocument.presentation=impress.desktop

# XFCE default applications
leafpad.desktop
ristretto.desktop

# LXDE default applications
beaver.desktop
gpicview.desktop

# Firefox
firefox.desktop

# OpenOffice
base.desktop
calc.desktop
draw.desktop
impress.desktop
math.desktop
web.desktop
writer.desktop
# Do not prefer writer for text/plain:
text/plain=pluma.desktop
++++++ mate-session-branding.gschema.override.in ++++++
[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-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
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to