Hello community,
here is the log from the commit of package mate-branding-openSUSE for
openSUSE:Factory checked in at 2014-11-06 16:50:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-10-25 11:13:50.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mate-branding-openSUSE.new/mate-branding-openSUSE.changes
2014-11-06 16:51:49.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 4 21:47:24 UTC 2014 - [email protected]
+
+- Fix default background filepath.
+- Make GSettings schema update after installing packages.
+- Spec cleanup.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.TSwfAq/_old 2014-11-06 16:51:50.000000000 +0100
+++ /var/tmp/diff_new_pack.TSwfAq/_new 2014-11-06 16:51:50.000000000 +0100
@@ -15,31 +15,31 @@
# 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.2
Release: 0
Summary: openSUSE Branding of the Mate Desktop Environment
License: MIT
Group: System/GUI/Other
-Url: http://www.mate-desktop.org/
+Url: http://mate-desktop.org/
Source1: mate-session-branding-openSUSE-mate_defaults.conf
Source2: mate-session-branding.gschema.override.in
-Source4: mate-panel-branding.gschema.override.in
+Source3: mate-panel-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-branding-upstream
BuildRequires: mate-menus-branding-upstream
BuildRequires: mate-panel-branding-upstream
BuildRequires: mate-session-manager-branding-upstream
BuildRequires: wallpaper-branding-openSUSE
+BuildRequires: pkgconfig(glib-2.0)
BuildArch: noarch
%description
@@ -50,9 +50,9 @@
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)
+Provides: mate-control-center-branding = %{mate_control_center_version}
+Conflicts: otherproviders(mate-control-center-branding)
%description -n mate-control-center-branding-openSUSE
This package provides the openSUSE definition of what appears in the
@@ -63,9 +63,9 @@
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)
+Provides: mate-panel-branding = %{mate_panel_version}
+Conflicts: otherproviders(mate-panel-branding)
%description -n mate-panel-branding-openSUSE
This package provides the openSUSE look and feel for the Mate Panel.
@@ -75,9 +75,9 @@
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)
+Provides: mate-menus-branding = %{mate_menus_version}
+Conflicts: otherproviders(mate-menus-branding)
%description -n mate-menus-branding-openSUSE
This package provides the openSUSE definitions for menus.
@@ -86,56 +86,66 @@
Summary: openSUSE Branding of mate-session-manager
License: GPL-2.0+
Group: System/GUI/Other
-Requires: gtk3-metatheme-adwaita
Requires: gtk2-metatheme-adwaita
+Requires: gtk3-metatheme-adwaita
+Requires: mate-icon-theme
Requires: mate-session-manager = %{mate_session_manager_version}
Requires: wallpaper-branding-openSUSE
-Requires: mate-icon-theme
-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
+Provides: mate-session-manager-branding = %{mate_session_manager_version}
+Conflicts: otherproviders(mate-session-manager-branding)
+%{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
+# 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
+%patch0
+# MATE Menus branding part.
+%patch1
+# 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 %{SOURCE4} zz-mate-panel-openSUSE-branding.gschema.override
+# MATE Panel branding part.
+cp -a %{SOURCE3} zz-mate-panel-openSUSE-branding.gschema.override
%build
-# Mate session manager branding part
+# MATE session manager branding part.
test -f %{_datadir}/wallpapers/openSUSE-default.xml
-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
+sed -e 's|@@WALLPAPER_URI@@|%{_datadir}/wallpapers/openSUSE-default.xml|'
mate-session-branding.gschema.override.in >
mate-session-branding.gschema.override
+# For sound theme.
+cat mate-session-branding.gschema.override | sed -e
's|@@IF_openSUSE@@||g;/^@@IF_/d' >
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
-install -d %{buildroot}%{_datadir}/glib-2.0/schemas
-install -m0644 zz-mate-panel-openSUSE-branding.gschema.override
%{buildroot}%{_datadir}/glib-2.0/schemas/
-# Mate Session Manager branding part
-install -d %{buildroot}%{_sysconfdir}
-install -m0644 mate_defaults.conf %{buildroot}%{_sysconfdir}/
-install -m0644 zz-mate-session-openSUSE-branding.gschema.override
%{buildroot}%{_datadir}/glib-2.0/schemas/
-# Remove unwanted menu file
+# MATE Control Center branding part.
+install -d %{buildroot}%{_sysconfdir}/xdg/menus/
+install -m 0644 *.menu %{buildroot}%{_sysconfdir}/xdg/menus/
+# MATE Panel branding part.
+install -Dm 0644 zz-mate-panel-openSUSE-branding.gschema.override \
+
%{buildroot}%{_datadir}/glib-2.0/schemas/zz-mate-panel-openSUSE-branding.gschema.override
+# MATE Session Manager branding part.
+install -Dm 0644 mate_defaults.conf
%{buildroot}%{_sysconfdir}/mate_defaults.conf
+install -m 0644 zz-mate-session-openSUSE-branding.gschema.override
%{buildroot}%{_datadir}/glib-2.0/schemas/
+# Remove unwanted menu file.
rm -r %{buildroot}%{_sysconfdir}/xdg/menus/mate-settings.menu
+%post -n mate-panel-branding-openSUSE
+%{glib2_gsettings_schema_post}
+
+%postun -n mate-panel-branding-openSUSE
+%{glib2_gsettings_schema_postun}
+
+%post -n mate-session-manager-branding-openSUSE
+%{glib2_gsettings_schema_post}
+
+%postun -n mate-session-manager-branding-openSUSE
+%{glib2_gsettings_schema_postun}
+
%files -n mate-control-center-branding-openSUSE
-%defattr (-, root, root)
+%defattr (-,root,root)
%config %{_sysconfdir}/xdg/menus/matecc.menu
%files -n mate-menus-branding-openSUSE
++++++ mate-session-branding.gschema.override.in ++++++
--- /var/tmp/diff_new_pack.TSwfAq/_old 2014-11-06 16:51:50.000000000 +0100
+++ /var/tmp/diff_new_pack.TSwfAq/_new 2014-11-06 16:51:50.000000000 +0100
@@ -1,6 +1,6 @@
[org.mate.background]
## Default wallpaper
-picture-filename = 'usr/share/wallpapers/openSUSE-default.xml'
+picture-filename = '@@WALLPAPER_URI@@'
picture-options = 'stretched'
primary-color = '#258c06'
secondary-color = '#258c06'
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
