Hello community,
here is the log from the commit of package cinnamon-branding-openSUSE for
openSUSE:Factory checked in at 2016-11-15 18:00:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-branding-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-branding-openSUSE/cinnamon-branding-openSUSE.changes
2016-09-30 15:32:36.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-branding-openSUSE.new/cinnamon-branding-openSUSE.changes
2016-11-15 18:01:00.000000000 +0100
@@ -1,0 +2,10 @@
+Tue Nov 8 13:01:41 UTC 2016 - [email protected]
+
+- Replace cinnamon-branding with cinnamon-gschemas-branding:
+ gschemas can be installed standalone from the main cinnamon
+ package yet still have to be branded.
+- Separate branding for libcinnamon-desktop-data.
+- Update Mint Cinnamon artwork to version 5.3:
+ * Remove obsolete show-icon-text key from org.nemo.preferences.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-branding.gschema.override.in
mint-artwork-cinnamon_5.2.tar.gz
New:
----
cinnamon-branding.gschema.override
libcinnamon-desktop-branding.gschema.override.in
mint-artwork-cinnamon_5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.hTPniO/_old 2016-11-15 18:01:01.000000000 +0100
+++ /var/tmp/diff_new_pack.hTPniO/_new 2016-11-15 18:01:01.000000000 +0100
@@ -16,8 +16,9 @@
#
-%define mint_artwork_ver 5.2
-%define cinnamon_version %(rpm -q --queryformat '%%{VERSION}' cinnamon)
+%define mint_artwork_ver 5.3
+%define cinnamon_gschemas_version %(rpm -q --queryformat '%%{VERSION}'
cinnamon-gschemas)
+%define libcinnamon_desktop_data_version %(rpm -q --queryformat '%%{VERSION}'
libcinnamon-desktop-data)
Name: cinnamon-branding-openSUSE
Version: 42.2
Release: 0
@@ -25,43 +26,73 @@
License: GPL-3.0+
Group: System/GUI/Other
Url: https://en.opensuse.org/Portal:Cinnamon
-Source1: cinnamon-branding.gschema.override.in
-Source2:
http://packages.linuxmint.com/pool/main/m/mint-artwork-cinnamon/mint-artwork-cinnamon_%{mint_artwork_ver}.tar.gz
-BuildRequires: cinnamon-branding-upstream
+Source1: cinnamon-branding.gschema.override
+Source2: libcinnamon-desktop-branding.gschema.override.in
+Source3:
http://packages.linuxmint.com/pool/main/m/mint-artwork-cinnamon/mint-artwork-cinnamon_%{mint_artwork_ver}.tar.gz
+BuildRequires: cinnamon-gschemas-branding-upstream
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme-branding-openSUSE
+BuildRequires: libcinnamon-desktop-data-branding-upstream
BuildRequires: pkgconfig
BuildRequires: wallpaper-branding-openSUSE
BuildRequires: pkgconfig(glib-2.0)
-Requires: adwaita-icon-theme
-Requires: cinnamon = %{cinnamon_version}
+BuildArch: noarch
+
+%description
+This package provides the openSUSE look and feel for the Cinnamon
+desktop environment.
+
+%package -n cinnamon-gschemas-branding-openSUSE
+Summary: openSUSE Branding of the Cinnamon Desktop Environment
+Group: System/Libraries
+Requires: cinnamon-gschemas = %{cinnamon_gschemas_version}
Requires: cinnamon-themes
Requires: libgnomesu
+Supplements: packageand(cinnamon-gschemas:branding-openSUSE)
+Conflicts: otherproviders(cinnamon-gschemas-branding)
+Provides: cinnamon-gschemas-branding = %{cinnamon_gschemas_version}
+# cinnamon-branding-openSUSE was last used in openSUSE Leap 42.2.
+Provides: cinnamon-branding-openSUSE = %{version}-%{release}
+Obsoletes: cinnamon-branding-openSUSE < %{version}-%{release}
+%glib2_gsettings_schema_requires
+
+%description -n cinnamon-gschemas-branding-openSUSE
+This package provides the openSUSE look and feel for the Cinnamon
+desktop environment.
+
+%package -n libcinnamon-desktop-data-branding-openSUSE
+Summary: openSUSE Branding of the Cinnamon Desktop Environment
+Group: System/GUI/Other
+Requires: adwaita-icon-theme
+Requires: libcinnamon-desktop-data = %{libcinnamon_desktop_data_version}
Requires: mate-themes
Requires: wallpaper-branding-openSUSE
-Supplements: packageand(cinnamon:branding-openSUSE)
-Conflicts: otherproviders(cinnamon-branding)
-Provides: cinnamon-branding = %{cinnamon_version}
-BuildArch: noarch
+Supplements: packageand(libcinnamon-desktop-data:branding-openSUSE)
+Conflicts: otherproviders(libcinnamon-desktop-data-branding)
+Provides: libcinnamon-desktop-data-branding =
%{libcinnamon_desktop_data_version}
%glib2_gsettings_schema_requires
-%description
+%description -n libcinnamon-desktop-data-branding-openSUSE
This package provides the openSUSE look and feel for the Cinnamon
desktop environment.
%prep
%setup -q -c -T
-cp -f %{SOURCE1} cinnamon-branding.gschema.override.in
-%setup -q -T -D -a 2
+cp -f %{SOURCE1} cinnamon-branding.gschema.override
+cp -f %{SOURCE2} libcinnamon-desktop-branding.gschema.override.in
+%setup -q -T -D -a 3
%build
[ -f %{_datadir}/wallpapers/openSUSE-default.xml ]
sed -e 's|@@WALLPAPER_URI@@|%{_datadir}/wallpapers/openSUSE-default.xml|' \
- cinnamon-branding.gschema.override.in > cinnamon-branding.gschema.override
+ libcinnamon-desktop-branding.gschema.override.in > \
+ libcinnamon-desktop-branding.gschema.override
%install
install -Dpm 0644 cinnamon-branding.gschema.override \
%{buildroot}%{_datadir}/glib-2.0/schemas/cinnamon-branding.gschema.override
+install -Dpm 0644 libcinnamon-desktop-branding.gschema.override \
+
%{buildroot}%{_datadir}/glib-2.0/schemas/libcinnamon-desktop-branding.gschema.override
install -Dpm 0644 %{_datadir}/icons/hicolor/scalable/apps/distributor.svg \
%{buildroot}%{_datadir}/cinnamon/theme/menu.svg
@@ -73,17 +104,33 @@
%fdupes %{buildroot}%{_datadir}/
-%post
+%post -n cinnamon-gschemas-branding-openSUSE
+%glib2_gsettings_schema_post
+
+%postun -n cinnamon-gschemas-branding-openSUSE
+%glib2_gsettings_schema_postun
+
+%post -n libcinnamon-desktop-data-branding-openSUSE
%glib2_gsettings_schema_post
-%postun
+%postun -n libcinnamon-desktop-data-branding-openSUSE
%glib2_gsettings_schema_postun
-%files
+%files -n cinnamon-gschemas-branding-openSUSE
%defattr(-,root,root)
%{_datadir}/glib-2.0/schemas/cinnamon-branding.gschema.override
+%dir %{_datadir}/cinnamon/
+%dir %{_datadir}/cinnamon/theme/
%{_datadir}/cinnamon/theme/menu.svg
%dir %{_datadir}/sounds/cinnamon/
%{_datadir}/sounds/cinnamon/opensuse/
+%exclude %{_datadir}/sounds/cinnamon/opensuse/volume.oga
+
+%files -n libcinnamon-desktop-data-branding-openSUSE
+%defattr(-,root,root)
+%{_datadir}/glib-2.0/schemas/libcinnamon-desktop-branding.gschema.override
+%dir %{_datadir}/sounds/cinnamon/
+%dir %{_datadir}/sounds/cinnamon/opensuse/
+%{_datadir}/sounds/cinnamon/opensuse/volume.oga
%changelog
++++++ cinnamon-branding.gschema.override ++++++
#
# glib2 gsettings overrides for Cinnamon integration with openSUSE.
# Copyright (c) 2012 Nelson Marques <[email protected]>
# Copyright (c) 2013 Marguerite Su <[email protected]>
# Copyright (c) 2016 Sorokin Alexei <[email protected]>
#
[org.cinnamon]
panel-launchers = ['firefox.desktop', 'nemo.desktop', 'gnome-terminal.desktop',
'YaST.desktop']
[org.cinnamon.theme]
name = 'Linux Mint'
[org.cinnamon.sounds]
login-enabled=true
login-file='/usr/share/sounds/cinnamon/opensuse/login.oga'
logout-enabled=true
logout-file='/usr/share/sounds/cinnamon/opensuse/logout.ogg'
switch-enabled=true
switch-file='/usr/share/sounds/cinnamon/opensuse/switch.oga'
close-enabled=false
close-file='/usr/share/sounds/cinnamon/opensuse/close.oga'
map-enabled=false
map-file='/usr/share/sounds/cinnamon/opensuse/map.oga'
minimize-enabled=false
minimize-file='/usr/share/sounds/cinnamon/opensuse/minimize.oga'
maximize-enabled=false
maximize-file='/usr/share/sounds/cinnamon/opensuse/maximize.oga'
unmaximize-enabled=false
unmaximize-file='/usr/share/sounds/cinnamon/opensuse/unmaximize.oga'
tile-enabled=true
tile-file='/usr/share/sounds/cinnamon/opensuse/tile.oga'
plug-enabled=true
plug-file='/usr/share/sounds/cinnamon/opensuse/plug.oga'
unplug-enabled=true
unplug-file='/usr/share/sounds/cinnamon/opensuse/unplug.oga'
++++++ libcinnamon-desktop-branding.gschema.override.in ++++++
#
# glib2 gsettings overrides for Cinnamon integration with openSUSE.
# Copyright (c) 2012 Nelson Marques <[email protected]>
# Copyright (c) 2013 Marguerite Su <[email protected]>
# Copyright (c) 2016 Sorokin Alexei <[email protected]>
#
[org.cinnamon.desktop.background]
picture-uri = 'file://@@WALLPAPER_URI@@'
picture-options = 'zoom'
primary-color = '#258c06'
secondary-color = '#258c06'
[org.cinnamon.desktop.interface]
gtk-decoration-layout = 'menu:minimize,maximize,close'
icon-theme = 'Adwaita'
gtk-theme = 'Menta'
[org.cinnamon.desktop.sound]
theme-name='freedesktop'
event-sounds=false
input-feedback-sounds=false
volume-sound-enabled=true
volume-sound-file='/usr/share/sounds/cinnamon/opensuse/volume.oga'
[org.cinnamon.desktop.wm.preferences]
button-layout = 'menu:minimize,maximize,close'
theme = 'Menta'
++++++ mint-artwork-cinnamon_5.2.tar.gz -> mint-artwork-cinnamon_5.3.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mint-artwork-cinnamon-5.2/debian/changelog
new/mint-artwork-cinnamon-5.3/debian/changelog
--- old/mint-artwork-cinnamon-5.2/debian/changelog 2016-05-05
11:34:53.000000000 +0200
+++ new/mint-artwork-cinnamon-5.3/debian/changelog 2016-11-05
17:12:22.000000000 +0100
@@ -1,3 +1,9 @@
+mint-artwork-cinnamon (5.3) serena; urgency=medium
+
+ * Removed obsolete show-icon-text key from org.nemo.preferences
+
+ -- Clement Lefebvre <[email protected]> Sat, 05 Nov 2016 16:11:48 +0000
+
mint-artwork-cinnamon (5.2) sarah; urgency=medium
* Added theme for metacity
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mint-artwork-cinnamon-5.2/usr/share/glib-2.0/schemas/linuxmint-artwork.gschema.override
new/mint-artwork-cinnamon-5.3/usr/share/glib-2.0/schemas/linuxmint-artwork.gschema.override
---
old/mint-artwork-cinnamon-5.2/usr/share/glib-2.0/schemas/linuxmint-artwork.gschema.override
2016-05-05 11:34:16.000000000 +0200
+++
new/mint-artwork-cinnamon-5.3/usr/share/glib-2.0/schemas/linuxmint-artwork.gschema.override
2016-11-05 17:11:43.000000000 +0100
@@ -129,4 +129,3 @@
[org.nemo.preferences]
thumbnail-limit=4294967295
-show-icon-text="never"
