Hello community,
here is the log from the commit of package mate-branding-openSUSE for
openSUSE:Factory checked in at 2015-11-11 10:31:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-07-08 06:59:09.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mate-branding-openSUSE.new/mate-branding-openSUSE.changes
2015-11-11 10:35:25.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Nov 5 20:43:01 UTC 2015 - [email protected]
+
+- Bump version to 42.1.
+- Rebase mate-control-center-branding-add-YaST.patch and
+ mate-menus-branding-remove-X-SuSE-ControlCenter.patch for
+ MATE 1.12.
+- Add missing gschema requires to mate-panel-branding-openSUSE.
+- Only depend on metatheme-numix-common: Gtk versions are
+ supplemented by it.
+- Require mate-applets and mate-applet-softupd.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.WsZbbo/_old 2015-11-11 10:35:25.000000000 +0100
+++ /var/tmp/diff_new_pack.WsZbbo/_new 2015-11-11 10:35:25.000000000 +0100
@@ -21,7 +21,7 @@
%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
+Version: 42.1
Release: 0
Summary: openSUSE Branding of the MATE Desktop Environment
License: MIT
@@ -32,8 +32,9 @@
Source3: mate-panel-branding.gschema.override.in
# Exactly the same as Xfce branding icons.
Source4: openSUSE-MATE-icons.tar.xz
+# PATCH-FIX-OPENSUSE mate-control-center-branding-add-YaST.patch
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
+# 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: mate-control-center-branding-upstream
@@ -64,11 +65,14 @@
Summary: openSUSE Branding of mate-panel
License: GPL-2.0+
Group: System/GUI/Other
+Requires: mate-applet-softupd
+Requires: mate-applets
Requires: mate-menu
Requires: mate-panel = %{mate_panel_version}
Supplements: packageand(mate-panel:branding-openSUSE)
Conflicts: otherproviders(mate-panel-branding)
Provides: mate-panel-branding = %{mate_panel_version}
+%glib2_gsettings_schema_requires
%description -n mate-panel-branding-openSUSE
This package provides the openSUSE look and feel for the MATE Panel.
@@ -89,10 +93,9 @@
Summary: openSUSE Branding of mate-session-manager
License: GPL-2.0+
Group: System/GUI/Other
-Requires: gtk2-metatheme-numix
-Requires: gtk3-metatheme-numix
Requires: mate-icon-theme
Requires: mate-session-manager = %{mate_session_manager_version}
+Requires: metatheme-numix-common
Requires: wallpaper-branding-openSUSE
Supplements: packageand(mate-session-manager:branding-openSUSE)
Conflicts: otherproviders(mate-session-manager-branding)
@@ -106,9 +109,9 @@
# MATE Control Center branding part.
# We will base the shell content on upstream content:
cp -a %{_sysconfdir}/xdg/menus/*.menu .
-%patch0
+%patch0 -p1
# MATE Menus branding part.
-%patch1
+%patch1 -p1
# MATE Session Manager branding part.
cp -a %{SOURCE1} mate_defaults.conf
cp -a %{SOURCE2} mate-session-branding.gschema.override.in
@@ -125,18 +128,19 @@
%install
# MATE Control Center branding part.
-install -d %{buildroot}%{_sysconfdir}/xdg/menus/
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/
install -m 0644 *.menu %{buildroot}%{_sysconfdir}/xdg/menus/
# MATE Panel branding part.
-install -d %{buildroot}%{_datadir}/pixmaps/
install -Dm 0644 zz-mate-panel-openSUSE-branding.gschema.override \
%{buildroot}%{_datadir}/glib-2.0/schemas/zz-mate-panel-openSUSE-branding.gschema.override
+mkdir -p %{buildroot}%{_datadir}/pixmaps/
install -m 0644 mate-*.png %{buildroot}%{_datadir}/pixmaps/
# 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/
+install -Dm 0644 zz-mate-session-openSUSE-branding.gschema.override \
+
%{buildroot}%{_datadir}/glib-2.0/schemas/zz-mate-session-openSUSE-branding.gschema.override
# Remove unwanted menu file.
-rm -r %{buildroot}%{_sysconfdir}/xdg/menus/mate-settings.menu
+rm -f
%{buildroot}%{_sysconfdir}/xdg/menus/mate-{settings,preferences-categories}.menu
%post -n mate-panel-branding-openSUSE
%glib2_gsettings_schema_post
++++++ mate-control-center-branding-add-YaST.patch ++++++
--- /var/tmp/diff_new_pack.WsZbbo/_old 2015-11-11 10:35:25.000000000 +0100
+++ /var/tmp/diff_new_pack.WsZbbo/_new 2015-11-11 10:35:25.000000000 +0100
@@ -1,19 +1,10 @@
---- 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>
+--- a/matecc.menu
++++ b/matecc.menu
+@@ -57,6 +57,7 @@
+ <And>
+ <Category>Settings</Category>
+ <Category>System</Category>
++ <Filename>YaST.desktop</Filename>
</And>
- </Include>
+ <And>
+ <Category>Settings</Category>
++++++ mate-menus-branding-remove-X-SuSE-ControlCenter.patch ++++++
--- /var/tmp/diff_new_pack.WsZbbo/_old 2015-11-11 10:35:25.000000000 +0100
+++ /var/tmp/diff_new_pack.WsZbbo/_new 2015-11-11 10:35:25.000000000 +0100
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/mate-applications.menu.orig
++++ b/mate-applications.menu
+@@ -135,6 +135,7 @@
<Category>System</Category>
<Not><Category>Settings</Category></Not>
</And>
@@ -8,7 +8,7 @@
</Include>
</Menu> <!-- End System Tools -->
-@@ -147,6 +148,7 @@
+@@ -148,6 +149,7 @@
<Not><Category>Core</Category></Not>
<Not><Category>Settings</Category></Not>
<Not><Category>Screensaver</Category></Not>
@@ -16,4 +16,3 @@
</And>
</Include>
</Menu> <!-- End Other -->
-
\ No newline at end of file
