Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2016-11-15 18:00:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon (Old) and /work/SRC/openSUSE:Factory/.cinnamon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2016-09-13 22:22:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2016-11-15 18:00:55.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Nov 8 13:01:41 UTC 2016 - [email protected] + +- Update to version 3.2.1: + * See /usr/share/doc/packages/cinnamon/changelog +- Rebase ../cinnamon-wheel-and-sbin-path.patch, + cinnamon-settings-native.patch, + cinnamon-settings-xscreensaver-path.patch, + cinnamon-no-gksu-requirement.patch, cinnamon-fallback-icewm.patch. +- Add cinnamon-fix-typelib-false-positive.patch: Avoid any false + positives in typelib detection. +- Add cinnamon-optional-ax-macros.patch: Make AX_ macros optional + (commit 023c17f). +- Remove requirements in cinnamon-branding-upstream that belong in + libcinnamon-desktop-branding-upstream. +- Replace cinnamon-branding with cinnamon-gschemas-branding: + gschemas can be installed standalone from the main cinnamon + package yet still have to be branded. + +------------------------------------------------------------------- Old: ---- cinnamon-3.0.7.tar.gz New: ---- cinnamon-3.2.1.tar.gz cinnamon-fix-typelib-false-positive.patch cinnamon-optional-ax-macros.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.6Yb0mK/_old 2016-11-15 18:00:57.000000000 +0100 +++ /var/tmp/diff_new_pack.6Yb0mK/_new 2016-11-15 18:00:57.000000000 +0100 @@ -19,14 +19,14 @@ %define __requires_exclude typelib\\((Cinnamon(|JS)|St)\\) %define __provides_exclude typelib\\(.*\\) %define _name Cinnamon -%define _version 3.0.0 +%define _version 3.2.0 Name: cinnamon -Version: 3.0.7 +Version: 3.2.1 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout License: GPL-2.0+ and LGPL-2.1 Group: System/GUI/Other -Url: http://cinnamon.linuxmint.com/ +Url: https://github.com/linuxmint/Cinnamon Source: https://github.com/linuxmint/%{_name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # Some documentation for people writing branding packages, shipped in the branding-upstream package. Source1: README.Gsettings-overrides @@ -42,21 +42,30 @@ Patch4: %{name}-no-gksu-requirement.patch # PATCH-FEATURE-OPENSUSE cinnamon-favourite-applications.patch [email protected] -- Remove mintinstall from favourites and add YaST. Patch5: %{name}-favourite-applications.patch +# PATCH-FIX-OPENSUSE cinnamon-fix-typelib-false-positive.patch [email protected] -- Avoid any false positives in typelib detection. +Patch6: %{name}-fix-typelib-false-positive.patch # PATCH-FEATURE-OPENSUSE cinnamon-fallback-icewm.patch [email protected] -- Use IceWM as fallback. -Patch6: %{name}-fallback-icewm.patch +Patch7: %{name}-fallback-icewm.patch +# PATCH-FIX-UPSTREAM cinnamon-optional-ax-macros.patch -- Make AX_ macros optional (commit 023c17f). +Patch8: %{name}-optional-ax-macros.patch +BuildRequires: autoconf +BuildRequires: autoconf-archive +BuildRequires: automake # For gnome-background-properties. BuildRequires: desktop-data-openSUSE-extra BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gnome-common +BuildRequires: gtk-doc # For distributor.svg. BuildRequires: hicolor-icon-theme-branding-openSUSE +BuildRequires: intltool +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python-devel +BuildRequires: python3-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(cinnamon-desktop) >= %{_version} BuildRequires: pkgconfig(cjs-internals-1.0) -BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gnome-bluetooth-1.0) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -70,10 +79,8 @@ BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(polkit-agent-1) Requires: %{name}-gschemas = %{version} -Requires: NetworkManager-gnome Requires: adwaita-icon-theme Requires: caribou -Requires: cinnamon-branding >= %{_version} Requires: cinnamon-control-center-common >= %{_version} Requires: cinnamon-screensaver >= %{_version} Requires: cinnamon-session >= %{_version} @@ -81,7 +88,9 @@ Requires: cjs >= %{_version} Requires: cups-pk-helper Requires: dbus-1-python +Requires: dbus-1-python3 Requires: glib2-tools +Requires: iso-country-flags-png Requires: libcinnamon-desktop-data >= %{_version} # gkbd-capplet / gkbd-keyboard-display. Requires: libgnomekbd @@ -96,6 +105,7 @@ Requires: python-pam Requires: python-pexpect Requires: python-pyinotify +Requires: python3-gobject Requires: v4l-tools Requires: wget Requires: xdg-utils @@ -105,18 +115,26 @@ Recommends: gnome-terminal Recommends: gnome-themes-standard Recommends: icewm -# cinnamon-2d, cinnamon-menu-editor, and cinnamon-settings were last used in openSUSE 13.2. +# cinnamon-2d was last used in openSUSE 13.2. Provides: %{name}-2d = %{version} Obsoletes: %{name}-2d < %{version} +# cinnamon-menu-editor was last used in openSUSE 13.2. Provides: %{name}-menu-editor = %{version} Obsoletes: %{name}-menu-editor < %{version} +# cinnamon-settings was last used in openSUSE 13.2. Provides: %{name}-settings = %{version} Obsoletes: %{name}-settings < %{version} # typelib-1_0-Cinnamon-0_1 was last used in openSUSE Leap 42.1. Provides: typelib-1_0-Cinnamon-0_1 = %{version} -Obsoletes: typelib-1_0-Cinnamon-0_1 <= %{version} +Obsoletes: typelib-1_0-Cinnamon-0_1 < %{version} %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 Requires: python-gobject-Gdk +Requires: python3-gobject-Gdk +%endif +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +Requires: NetworkManager-applet +%else +Requires: NetworkManager-gnome %endif %description @@ -127,22 +145,24 @@ %package gschemas Summary: GNU/Linux Desktop featuring a traditional layout -- GSchemas Group: System/Libraries +Requires: %{name}-gschemas-branding = %{version} %glib2_gsettings_schema_requires %description gschemas This package provides GSettings schemas for Cinnamon Desktop Environment. -%package branding-upstream +%package gschemas-branding-upstream Summary: Upstream definitions of default settings and applications Group: System/Libraries -Requires: %{name} = %{version} -Requires: gnome-backgrounds +Requires: %{name}-gschemas = %{version} Requires: libgnomesu -Requires: metatheme-adwaita-common -Supplements: packageand(%{name}:branding-upstream) -Conflicts: otherproviders(%{name}-branding) -Provides: %{name}-branding = %{version} +Supplements: packageand(%{name}-gschemas:branding-upstream) +Conflicts: otherproviders(%{name}-gschemas-branding) +Provides: %{name}-gschemas-branding = %{version} +# cinnamon-branding-upstream was last used in openSUSE Leap 42.2. +Provides: %{name}-branding-upstream = %{version} +Obsoletes: %{name}-branding-upstream < %{version} BuildArch: noarch #BRAND: A /usr/share/glib-2.0/schemas/$NAME.gschema.override file can #BRAND: be used to override the default value for GSettings keys. See @@ -150,7 +170,7 @@ #BRAND: package should then have proper Requires for features changed #BRAND: with such an override file. -%description branding-upstream +%description gschemas-branding-upstream This package provides upstream defaults for settings stored with GSettings and applications used by the MIME system. @@ -163,6 +183,8 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 cp -a %{SOURCE1} . %build @@ -171,7 +193,7 @@ --disable-schemas-compile \ --enable-gtk-doc \ --with-ca-certificates=%{_sysconfdir}/ssl/ca-bundle.pem -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install @@ -189,7 +211,7 @@ dirname $(find %{buildroot}%{_datadir} -type f -name '*.py') | sort -u | while read dir; do # Add execution bit to scripts with shebangs and remove from others. ls *.py | while read py; do - if [[ "$(head -c2 "$py"; echo)" == "#!" ]]; then + if [ "$(head -c2 "$py"; echo)" = '#!' ]; then chmod a+x "$py" else chmod a-x "$py" @@ -229,11 +251,12 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING NEWS README debian/changelog +%doc AUTHORS COPYING README debian/changelog %dir %{_sysconfdir}/xdg/menus/ %config %{_sysconfdir}/xdg/menus/%{name}-applications.menu %config %{_sysconfdir}/xdg/menus/%{name}-applications-merged %{_bindir}/%{name}* +%{_bindir}/xlet-settings %{_libexecdir}/%{name}*/ %dir %{_libdir}/%{name}/ %{_libdir}/%{name}/*.so @@ -248,6 +271,7 @@ %{_datadir}/%{name}-session/ %{_datadir}/xsessions/%{name}*.desktop %{_datadir}/applications/%{name}*.desktop +%{_datadir}/icons/hicolor/*/apps/cinnamon-*.* %{_datadir}/icons/hicolor/*/*/cs-*.* %{_datadir}/icons/hicolor/*/*/pan-*.* %{_datadir}/icons/hicolor/*/actions/*-lock-*.* @@ -264,7 +288,7 @@ %defattr(-,root,root) %{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml -%files branding-upstream +%files gschemas-branding-upstream %defattr(-,root,root) %doc README.Gsettings-overrides %{_datadir}/%{name}/theme/menu*.svg ++++++ cinnamon-3.0.7.tar.gz -> cinnamon-3.2.1.tar.gz ++++++ ++++ 43000 lines of diff (skipped) ++++++ cinnamon-fallback-icewm.patch ++++++ --- /var/tmp/diff_new_pack.6Yb0mK/_old 2016-11-15 18:00:57.000000000 +0100 +++ /var/tmp/diff_new_pack.6Yb0mK/_new 2016-11-15 18:00:57.000000000 +0100 @@ -1,15 +1,15 @@ --- a/files/usr/bin/cinnamon-launcher +++ b/files/usr/bin/cinnamon-launcher -@@ -1,7 +1,7 @@ - #! /usr/bin/python2 - # -*- coding=utf-8 -*- +@@ -3,7 +3,7 @@ + """ Launches or restarts cinnamon + """ -FALLBACK_COMMAND = "metacity" +FALLBACK_COMMAND = "icewm" FALLBACK_ARGS = ("--replace",) - import os, sys, gettext -@@ -28,11 +28,6 @@ if __name__ == "__main__": + import os +@@ -34,11 +34,6 @@ if __name__ == "__main__": exit_status = os.waitpid(cinnamon_pid, 0)[1] if exit_status != 0: if os.fork() == 0: ++++++ cinnamon-fix-typelib-false-positive.patch ++++++ --- a/js/ui/indicatorManager.js +++ b/js/ui/indicatorManager.js @@ -1039,7 +1039,7 @@ IndicatorActor.prototype = { // FIXME: The Tooltips are an object and is render in html format. To show the real tooltips // (this._indicator.toolTip), we will need a good html parser. - // In the tooltips implementation, maybe imports.gi.WebKit and use Webkit.WebView and then loadData. + // In the tooltips implementation, maybe import gi.WebKit and use Webkit.WebView and then loadData. // So instead we will used the title as a tooltip. getToolTip: function() { return this._indicator.title; ++++++ cinnamon-no-gksu-requirement.patch ++++++ --- /var/tmp/diff_new_pack.6Yb0mK/_old 2016-11-15 18:00:57.000000000 +0100 +++ /var/tmp/diff_new_pack.6Yb0mK/_new 2016-11-15 18:00:57.000000000 +0100 @@ -1,11 +1,10 @@ --- a/files/usr/bin/cinnamon-settings-users +++ b/files/usr/bin/cinnamon-settings-users -@@ -2,5 +2,4 @@ +@@ -5,4 +5,4 @@ import os -os.system("gksu /usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py") -- +os.system("xdg-su -c '/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py'") --- a/files/usr/share/cinnamon/applets/[email protected]/applet.js +++ b/files/usr/share/cinnamon/applets/[email protected]/applet.js @@ -17,12 +16,12 @@ - Util.spawnCommandLine("gksu -m '" + _("Please provide your password to uninstall this application") + "' /usr/bin/cinnamon-remove-application '" + this._appButton.app.get_app_info().get_filename() + "'"); - this._appButton.appsMenuButton.menu.close(); - break; - } - return false; - } + case "run_with_nvidia_gpu": + Util.spawnCommandLine("optirun gtk-launch " + this._appButton.app.get_id()); + this._appButton.appsMenuButton.menu.close(); --- a/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py +++ b/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py -@@ -415,6 +415,7 @@ class SAModule: +@@ -205,6 +205,7 @@ class SAModule: def process (self): name = self.name.replace("gksudo ", "") name = name.replace("gksu ", "") @@ -32,7 +31,7 @@ for path in os.environ["PATH"].split(os.pathsep): --- a/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py +++ b/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py -@@ -481,9 +481,8 @@ class Spice_Harvester: +@@ -449,9 +449,8 @@ class Spice_Harvester: subprocess.call(["msgfmt", "-c", os.path.join(dirname, file.filename), "-o", os.path.join(this_locale_dir, '%s.mo' % uuid)]) ui_thread_do(self.progresslabel.set_text, _("Installing %s...") % title) elif "gschema.xml" in file.filename: @@ -44,7 +43,7 @@ tool = "/usr/share/cinnamon/cinnamon-settings/bin/installSchema.py %s" % (os.path.join(dirname, file.filename)) command = "%s %s" % (launcher, tool) os.system(command) -@@ -582,9 +581,8 @@ class Spice_Harvester: +@@ -550,9 +549,8 @@ class Spice_Harvester: try: if not self.themes: if schema_filename != "": ++++++ cinnamon-optional-ax-macros.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_CONFIG_SRCDIR([src/cinnamon-global.c] AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) -AX_IS_RELEASE([always]) +m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([always])]) AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"]) AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"]) @@ -161,7 +161,8 @@ AC_SUBST(GIRDIR) TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" AC_SUBST(TYPELIBDIR) -AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS]) +m4_ifdef([AX_COMPILER_FLAGS], + [AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])]) AC_ARG_ENABLE(jhbuild-wrapper-script, AS_HELP_STRING([--jhbuild-wrapper-script=yes],[Make "cinnamon" script work for jhbuild]),,enable_jhbuild_wrapper_script=no) ++++++ cinnamon-settings-native.patch ++++++ --- /var/tmp/diff_new_pack.6Yb0mK/_old 2016-11-15 18:00:57.000000000 +0100 +++ /var/tmp/diff_new_pack.6Yb0mK/_new 2016-11-15 18:00:57.000000000 +0100 @@ -1,6 +1,6 @@ --- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py +++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py -@@ -74,12 +74,9 @@ CONTROL_CENTER_MODULES = [ +@@ -76,12 +76,9 @@ CONTROL_CENTER_MODULES = [ STANDALONE_MODULES = [ # Label Executable Icon Category Keywords for filter [_("Printers"), "system-config-printer", "cs-printer", "hardware", _("printers, laser, inkjet")], ++++++ cinnamon-settings-xscreensaver-path.patch ++++++ --- /var/tmp/diff_new_pack.6Yb0mK/_old 2016-11-15 18:00:57.000000000 +0100 +++ /var/tmp/diff_new_pack.6Yb0mK/_new 2016-11-15 18:00:57.000000000 +0100 @@ -1,11 +1,11 @@ --- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_screensaver.py +++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_screensaver.py -@@ -30,7 +30,7 @@ LOCK_INACTIVE_OPTIONS = [ - (3600, _("After 1 hour")) +@@ -34,7 +34,7 @@ LOCK_INACTIVE_OPTIONS = [ + (3600, _("1 hour")) ] -XSCREENSAVER_PATH = "/usr/share/xscreensaver/config/" +XSCREENSAVER_PATH = "/etc/xscreensaver/" + def list_header_func(row, before, user_data): - if before and not row.get_header(): ++++++ cinnamon-wheel-and-sbin-path.patch ++++++ --- /var/tmp/diff_new_pack.6Yb0mK/_old 2016-11-15 18:00:57.000000000 +0100 +++ /var/tmp/diff_new_pack.6Yb0mK/_new 2016-11-15 18:00:57.000000000 +0100 @@ -1,6 +1,6 @@ --- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py +++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py -@@ -34,12 +34,12 @@ def getGraphicsInfos(): +@@ -36,12 +36,12 @@ def getGraphicsInfos(): count = 0 envpath = os.environ["PATH"] os.environ["PATH"] = envpath + ":/usr/local/sbin:/usr/sbin:/sbin" @@ -17,7 +17,7 @@ --- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -@@ -152,7 +152,6 @@ class PasswordDialog(Gtk.Dialog): +@@ -158,7 +158,6 @@ class PasswordDialog(Gtk.Dialog): self.user = user self.password_mask = password_mask @@ -25,7 +25,7 @@ self.set_modal(True) self.set_skip_taskbar_hint(True) -@@ -219,13 +218,7 @@ class PasswordDialog(Gtk.Dialog): +@@ -225,13 +224,7 @@ class PasswordDialog(Gtk.Dialog): newpass = self.new_password.get_text() self.user.set_password(newpass, "") mask = self.group_mask.get_text() @@ -40,7 +40,7 @@ self.destroy() def set_passwords_visibility(self): -@@ -574,7 +567,7 @@ class Module: +@@ -580,7 +573,7 @@ class Module: response = dialog.run() if response == Gtk.ResponseType.OK: groups = dialog.get_selected_groups() @@ -49,7 +49,7 @@ groups.sort() self.groups_label.set_text(", ".join(groups)) dialog.destroy() -@@ -808,11 +801,11 @@ class Module: +@@ -814,11 +807,11 @@ class Module: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) description = "<b>%s</b>\n%s" % (fullname, username) piter = self.users.append(None, [new_user, pixbuf, description]) @@ -64,7 +64,7 @@ self.load_groups() dialog.destroy() -@@ -857,7 +850,7 @@ class Module: +@@ -863,7 +856,7 @@ class Module: d.set_default_response(Gtk.ResponseType.NO) r = d.run() if r == Gtk.ResponseType.YES: @@ -73,7 +73,7 @@ self.load_groups() d.destroy() -@@ -865,7 +858,7 @@ class Module: +@@ -871,7 +864,7 @@ class Module: dialog = GroupDialog(_("Group Name"), "") response = dialog.run() if response == Gtk.ResponseType.OK: @@ -82,7 +82,7 @@ self.load_groups() dialog.destroy() -@@ -876,7 +869,7 @@ class Module: +@@ -882,7 +875,7 @@ class Module: dialog = GroupDialog(_("Group Name"), group) response = dialog.run() if response == Gtk.ResponseType.OK:
