April 2016 - openSUSE Commits - openSUSE Mailing Lists

commit aria2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package aria2 for openSUSE:Factory checked in at 2016-04-01 13:03:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aria2 (Old) and /work/SRC/openSUSE:Factory/.aria2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aria2" Changes: -------- --- /work/SRC/openSUSE:Factory/aria2/aria2.changes 2016-03-07 13:30:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aria2.new/aria2.changes 2016-04-01 13:03:26.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Mar 31 20:24:17 UTC 2016 - mpluskal(a)suse.com + +- Update to 1.21.0 + * SessionSerializer: Fix bug that pause=true is added to wrong + item + * Add "following" to aria2.tellStatus response key as reverse + link for followedBy + * mingw: Add warning for falloc + * Update ciphers in AppleTLS + * OSX: Enable libssh2 and sftp + * Update OSX dependencies + * Fix compile error without TLS support + * Add support for using gnutls system wide crypto policy +- Update project url + +------------------------------------------------------------------- Old: ---- aria2-1.20.0.tar.xz New: ---- aria2-1.21.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aria2.spec ++++++ --- /var/tmp/diff_new_pack.EcDYLS/_old 2016-04-01 13:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.EcDYLS/_new 2016-04-01 13:03:27.000000000 +0200 @@ -18,24 +18,24 @@ %define somajor 0 Name: aria2 -Version: 1.20.0 +Version: 1.21.0 Release: 0 Summary: Parallelizing Multi-Protocol Utility for Downloading Files License: SUSE-GPL-2.0-with-openssl-exception Group: Productivity/Networking/Other -Url: http://aria2.sourceforge.net/ +Url: https://aria2.github.io Source0: https://github.com/tatsuhiro-t/aria2/releases/download/release-%{version}/a… Source1: %{name}.changes BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: gmp-devel -BuildRequires: pkg-config BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(libcares) BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(nettle) +BuildRequires: pkgconfig(pkg-config) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(zlib) Recommends: %{name}-lang ++++++ aria2-1.20.0.tar.xz -> aria2-1.21.0.tar.xz ++++++ ++++ 9064 lines of diff (skipped)

1 0

commit libgda for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package libgda for openSUSE:Factory checked in at 2016-04-01 13:03:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgda (Old) and /work/SRC/openSUSE:Factory/.libgda.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgda" Changes: -------- --- /work/SRC/openSUSE:Factory/libgda/libgda.changes 2016-03-29 14:26:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgda.new/libgda.changes 2016-04-01 13:03:25.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 30 23:35:14 UTC 2016 - dvaleev(a)suse.com + +- Now with Java 1.8, on ppc64le set java arch to ppc64 only + if we build with java 1.5 or 1.6 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgda.spec ++++++ --- /var/tmp/diff_new_pack.VsZBGa/_old 2016-04-01 13:03:26.000000000 +0200 +++ /var/tmp/diff_new_pack.VsZBGa/_new 2016-04-01 13:03:26.000000000 +0200 @@ -379,8 +379,8 @@ # IcedTea 2.5.0 have ppc64 as libarch for ppc64le # except if still build with java 1.7 %ifarch ppc64le -%define is_java_1_7 %(rpm -qa |grep jdk.devel|grep -c 1_7) -%if ! 0%{is_java_1_7} +%define ppc64_java %(rpm -qa |grep jdk.devel|grep -Ec '(1_5|1_6)') +%if 0%{ppc64_java} getspARCH=ppc64 %endif %endif

1 0

commit gnome-code-assistance for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package gnome-code-assistance for openSUSE:Factory checked in at 2016-04-01 13:03:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-code-assistance (Old) and /work/SRC/openSUSE:Factory/.gnome-code-assistance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-code-assistance" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-code-assistance/gnome-code-assistance.changes 2015-10-06 16:10:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-code-assistance.new/gnome-code-assistance.changes 2016-04-01 13:03:23.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Mar 30 09:31:03 UTC 2016 - zaitor(a)opensuse.org + +- Prepare for libvala-0.32 via sed replacement. +- Following above change, replace pkgconfig(libvala-0.30) for + pkgconfig(libvala-0.32) BuildRequires. +- Add gca-python-fix-crash-when-missing-pylint.patch: Fix crash + when pylint is not available. Patch from upstream git. + +------------------------------------------------------------------- New: ---- gca-python-fix-crash-when-missing-pylint.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-code-assistance.spec ++++++ --- /var/tmp/diff_new_pack.cXBQjv/_old 2016-04-01 13:03:24.000000000 +0200 +++ /var/tmp/diff_new_pack.cXBQjv/_new 2016-04-01 13:03:24.000000000 +0200 @@ -26,6 +26,8 @@ Group: Development/ Url: https://git.gnome.org/browse/gnome-code-assistance Source: http://download.gnome.org/sources/gnome-code-assistance/3.16/%{name}-%{vers… +# PATCH-FIX-UPSTREAM gca-python-fix-crash-when-missing-pylint.patch zaitor(a)opensuse.org -- python: fix crash when pylint is not available. +Patch0: gca-python-fix-crash-when-missing-pylint.patch # Generic build dependencies BuildRequires: pkgconfig(gio-2.0) # Python backend @@ -46,7 +48,7 @@ BuildRequires: pkgconfig(gio-2.0) >= 2.36 BuildRequires: pkgconfig(glib-2.0) >= 2.36 BuildRequires: pkgconfig(gobject-2.0) >= 2.36 -BuildRequires: pkgconfig(libvala-0.30) +BuildRequires: pkgconfig(libvala-0.32) BuildRequires: pkgconfig(vapigen) BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -59,8 +61,9 @@ %prep %setup -q -# Prepare for vala-0.30 - Upstream have committed the same change, use sed to avoid need for bootstrapping. -sed -i 's:libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22 libvala-0.20:libvala-0.30 libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22 libvala-0.20:' configure +# Prepare for vala-0.32 - Upstream have committed the same change, use sed to avoid need for bootstrapping. +sed -i 's:libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22 libvala-0.20:libvala-0.32 libvala-0.30 libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22 libvala-0.20:' configure +%patch0 -p1 %build %configure \ ++++++ gca-python-fix-crash-when-missing-pylint.patch ++++++ >From cd0f439a2cb67a1f7f0a6f468c33db5731321402 Mon Sep 17 00:00:00 2001 From: Christian Hergert <christian(a)hergert.me> Date: Sun, 21 Feb 2016 17:11:10 -0800 Subject: python: fix crash when pylint is not available If the client suggests the use of pylint using {"pylint":True}, then make sure that we have pylint available before calling into the linter module. --- backends/python/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backends/python/__init__.py b/backends/python/__init__.py index 9476d6f..8dc2cf2 100644 --- a/backends/python/__init__.py +++ b/backends/python/__init__.py @@ -24,8 +24,9 @@ import re try: from pylint import lint from pylint.reporters.text import TextReporter + HAS_PYLINT = True except ImportError: - pass + HAS_PYLINT = False from gnome.codeassistance import transport, types @@ -97,7 +98,7 @@ class Service(transport.Service): # PEP8 is not installed. Do nothing. pass - if "pylint" in options and options["pylint"]: + if HAS_PYLINT and "pylint" in options and options["pylint"]: pylint = PyLint(doc.data_path) diagnostics = pylint.run() -- cgit v0.12

1 0

commit meld for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2016-04-01 13:03:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "meld" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2015-12-13 09:40:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2016-04-01 13:03:19.000000000 +0200 @@ -1,0 +2,63 @@ +Mon Mar 28 12:48:49 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 3.15.2: + + Port to use GtkSourceView's file loader and saver helpers, + bringing several benefits. + + Loading and saving speed are significantly improved, and are + asychronous. + + We try a wider range of locale-specific file encodings by + default, and still support user-specified default encodings. + + We now support saving files with inconsistent newline types. + + Binary files will now be loaded on a best-effort basis. + + Reinstate support for Darcs; this is currently limited to very + new (>2.10.3) versions. + + Folder comparisons now apply text filters in the same way as + file comparisons. + + Add support for showing new shortcuts help dialog. + + Preliminary support for building Meld as an xdg-app. + + Fixes: + - Many fixes for GTK+ 3.20 theming changes and widget + compatibility issues. + - All accelerators should now consistently use the Primary key, + for better integration on OSX systems. + - Significantly improve text filter performance. + - Fix performance regression where scanning for missing files + was extremely slow, especially in large repositories. + - Fix truncated line number display in short file. + - Fix filter dropdown not appearing below button. + - Add more documentation on setup and installation + requirements. + - Update the AppData to spec version 0.7+. + + Updated translations. + +------------------------------------------------------------------- +Sun Dec 20 21:53:26 UTC 2015 - damjanovic.ivo(a)gmail.com + +- Update to version 3.15.1: + + Text ignored by filters is now dimmed to give some visual + feedback that it's being ignored. + + Text filters now apply independently, improving consistency; + note that this is a behaviour change as filter order no longer + matters, and filters will always apply to the original + (not the filtered) text. + + Recent menu items now show more detail in tooltips. + + Update dialog action area layout for GTK+ theme changes. + + Fixes: + - Conflict resolution prompt now resolves properly again. + - Silence some GTK+ assertions on window close. + - Fix default filter issues from recent rework. + - Percent-containing commit messages no longer corrupt + our recent commit messages store. + - Fix some problems with unicode user directories on Windows. + - Fix encoding issues when saving files with load errors. + - Fix drawing corruption when scrolling horizontally. + - Fix clicking on the diffmap scrolling to the wrong location. + - Fix off-by-one drawing error for final line in file. + - Fix introspection requires to silence startup warnings. + - Fix clearing syncpoints. + - Add manual appdata kudos markers. + - PEP8 fixes. + + Updated translations. +- Rebase meld-nodocs.patch. + +------------------------------------------------------------------- Old: ---- meld-3.14.2.tar.xz New: ---- meld-3.15.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.H4hLMa/_old 2016-04-01 13:03:19.000000000 +0200 +++ /var/tmp/diff_new_pack.H4hLMa/_new 2016-04-01 13:03:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package meld # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: meld -Version: 3.14.2 +Version: 3.15.2 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ Group: Development/Tools/Other Url: http://meldmerge.org/ -Source: http://download.gnome.org/sources/meld/3.14/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/meld/3.15/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE meld-nodocs.patch dimstar(a)opensuse.org -- We do not want COPYING and NEWS installed like this Patch0: meld-nodocs.patch BuildRequires: fdupes ++++++ meld-3.14.2.tar.xz -> meld-3.15.2.tar.xz ++++++ ++++ 38756 lines of diff (skipped) ++++++ meld-nodocs.patch ++++++ --- /var/tmp/diff_new_pack.H4hLMa/_old 2016-04-01 13:03:20.000000000 +0200 +++ /var/tmp/diff_new_pack.H4hLMa/_new 2016-04-01 13:03:20.000000000 +0200 @@ -1,12 +1,8 @@ ---- - setup.py | 3 --- - 1 file changed, 3 deletions(-) - -Index: meld-3.13.1/setup.py +Index: meld-3.15.1/setup.py =================================================================== ---- meld-3.13.1.orig/setup.py 2015-03-28 23:25:37.000000000 +0100 -+++ meld-3.13.1/setup.py 2015-04-20 23:31:04.000000000 +0200 -@@ -40,9 +40,6 @@ setup( +--- setup.py.orig/setup.py 2015-12-20 23:17:30.391608069 +0100 ++++ setup.py/setup.py 2015-12-20 23:17:51.925337353 +0200 +@@ -40,9 +40,6 @@ ('share/man/man1', ['meld.1'] ), @@ -14,5 +10,5 @@ - ['COPYING', 'NEWS'] - ), ('share/meld', - ['data/meld.css', 'data/meld-dark.css'] + ['data/meld.css'] ),

1 0

commit metacity for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package metacity for openSUSE:Factory checked in at 2016-04-01 13:03:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/metacity (Old) and /work/SRC/openSUSE:Factory/.metacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "metacity" Changes: -------- --- /work/SRC/openSUSE:Factory/metacity/metacity.changes 2016-02-17 12:15:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.metacity.new/metacity.changes 2016-04-01 13:03:17.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Mar 30 18:26:52 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 3.18.3: + + Add Icon=preferences-system-windows in metacity.destkop. + + Scale window decorations on HiDPI displays, based on mutter. + + Partially revert "build everything as library". + +------------------------------------------------------------------- Old: ---- metacity-3.18.2.tar.xz New: ---- metacity-3.18.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.YYA5gN/_old 2016-04-01 13:03:18.000000000 +0200 +++ /var/tmp/diff_new_pack.YYA5gN/_new 2016-04-01 13:03:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: metacity -Version: 3.18.2 +Version: 3.18.3 Release: 0 Summary: A Window Manager for the GNOME Desktop License: GPL-2.0+ ++++++ metacity-3.18.2.tar.xz -> metacity-3.18.3.tar.xz ++++++ ++++ 4757 lines of diff (skipped)

1 0

commit glom for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package glom for openSUSE:Factory checked in at 2016-04-01 13:03:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glom (Old) and /work/SRC/openSUSE:Factory/.glom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glom" Changes: -------- --- /work/SRC/openSUSE:Factory/glom/glom.changes 2015-10-08 08:25:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glom.new/glom.changes 2016-04-01 13:03:14.000000000 +0200 @@ -1,0 +2,89 @@ +Tue Mar 15 15:13:46 UTC 2016 - dimstar(a)opensuse.org + +- Fix build with python 3.5: + + Change PYTHON_VERSION to "3.5" and PYTHON to "python3.5" in + the configure call. + + Also drop with-boost-python=boost_python-mt-py34 call, no + longer needed. + +------------------------------------------------------------------- +Fri Mar 11 09:13:59 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 1.31.3: + + Show the translated UI in non-English locales, even on newer + Linux distros (bgo#761372). + + Default Field Formatting: Let people actually change this + again, fixing a regression in (approx) Glom 1.25.4 + (bgo#763348). + + Help menu item: Make this work again with recent GNOME systems + (bgo#763250). + + Export: Don't lose precision when exporting large numeric + values (bgo#763229). + +------------------------------------------------------------------- +Fri Feb 26 13:14:53 UTC 2016 - dimstar(a)opensuse.org + +- Update to version 1.31.2: + + Fix crash when loading images into an image field. + + Fix crash caused by assert in recent versions of + libevince-view (bgo#761396). + + Really forget a table when removing it (bgo#754645). + + Table deletion: Actually let the user cancel the dialog. + + Initialize PostgresSQL database with the C locale (bgo#761372). + + Try to catch filesystem errors sooner (bgo#761373). + + Details layout: Allow notebooks at top-level (bgo#759511). + + Connection to central server: + - Ask again if the connection fails. + - Specify a timeout. + + Build system: + - Check for, and require, C++14. + - Lots of modernization of the C++ source code. + +------------------------------------------------------------------- +Sun Nov 29 19:30:02 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 1.31.1: + + Build: + - Convert the source code to C++11. + - Remove unused source code. + - Use libxml++-3.0 instead of libxml++-2.6. + - Improvements to how we find and use boost libraries. +- Replace pkgconfig(libxml++-2.6) for pkgconfig(libxml++-3.0) + BuildRequires following upstream changes. +- Bump api and apiRPM version to 1.32 following upstream. + +------------------------------------------------------------------- +Thu Sep 24 13:15:49 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 1.30.0: + + Dialog_FieldDefinition: Show self-triggering lookups as + grayed-out (bgo#754641). + + Lookups: Prevent endless self lookups. + + Use std::endl instead of std::cerr where std::endl was meant. + (bgo#754294). + + Build: Disable use of yelp if --disable-documentation was used. + + More use of C++11. + + EggSpreadTableDnd: Replace use of deprecated + gtk_style_context_set_background. + + Use property_whatever() instead of set_property("whatever"). + + ComboBox_Relationship: Fix a typo in a null check. + +------------------------------------------------------------------- +Mon Jul 20 08:35:02 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 1.29.5: + + Fix the build with python 3 and require python 3. + + Build with (and require) C++11, using some simple C++11 + features. +- Replace python-devel for python3-devel BuildRequires, following + upstreams port. Also add python3 BuildRequires: as python3-devel + only brings in python3-base. +- Pass PYTHON_VERSION="3.4", PYTHON=python3.4 and + --with-boost-python=boost_python-mt-py34 to configure as python3 + is not default in openSUSE yet. +- Rename sub-package python-glom to python3-glom. +- Following above change, obsolete python-glom and change + packageand(glom:python) to packageand(glom:python3) Supplements. +- Substitute python-glom Requires for the new python3-glom. + +------------------------------------------------------------------- Old: ---- glom-1.29.4.tar.xz New: ---- glom-1.31.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glom.spec ++++++ --- /var/tmp/diff_new_pack.TETz9X/_old 2016-04-01 13:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.TETz9X/_new 2016-04-01 13:03:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package glom # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -17,17 +17,17 @@ # -%define api 1.30 -%define apiRPM 1_30 +%define api 1.32 +%define apiRPM 1_32 Name: glom Summary: Database designer and user interface License: GPL-3.0+ Group: Productivity/Databases/Clients -Version: 1.29.4 +Version: 1.31.3 Release: 0 # FIXME: once bnc#793882 is fixed, re-enable %%check section -Source: http://download.gnome.org/sources/glom/1.29/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/glom/1.31/%{name}-%{version}.tar.xz # This is indeed GPL-3.0+, see http://git.gnome.org/browse/glom/commit/?id=6b16a90f8ea902d91db85656cc11c6a… Url: http://www.glom.org/ BuildRequires: boost-devel @@ -38,24 +38,25 @@ BuildRequires: itstool BuildRequires: postgresql-devel BuildRequires: postgresql-server -BuildRequires: python-devel +BuildRequires: python3 +BuildRequires: python3-devel BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(evince-view-3.0) BuildRequires: pkgconfig(gdkmm-3.0) >= 3.4.0 -BuildRequires: pkgconfig(giomm-2.4) >= 2.43.1 -BuildRequires: pkgconfig(glibmm-2.4) >= 2.37.93 +BuildRequires: pkgconfig(giomm-2.4) >= 2.47.4 +BuildRequires: pkgconfig(glibmm-2.4) > 2.47.4 BuildRequires: pkgconfig(goocanvas-2.0) >= 2.0.1 -BuildRequires: pkgconfig(goocanvasmm-2.0) >= 1.90.8 -BuildRequires: pkgconfig(gtkmm-3.0) >= 3.15.2 -BuildRequires: pkgconfig(gtksourceviewmm-3.0) -BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(goocanvasmm-2.0) >= 1.90.11 +BuildRequires: pkgconfig(gtkmm-3.0) >= 3.18.0 +BuildRequires: pkgconfig(gtksourceviewmm-3.0) >= 3.18.0 +BuildRequires: pkgconfig(libarchive) >= 3.0 BuildRequires: pkgconfig(libepc-1.0) >= 0.4.0 BuildRequires: pkgconfig(libgda-5.0) >= 5.2.1 BuildRequires: pkgconfig(libgda-mysql-5.0) BuildRequires: pkgconfig(libgda-postgres-5.0) -BuildRequires: pkgconfig(libgdamm-5.0) >= 4.99.8 -BuildRequires: pkgconfig(libxml++-2.6) >= 2.23.1 +BuildRequires: pkgconfig(libgdamm-5.0) >= 4.99.10 +BuildRequires: pkgconfig(libxml++-3.0) >= 2.24.0 BuildRequires: pkgconfig(libxslt) >= 1.1.10 BuildRequires: pkgconfig(pygobject-3.0) >= 2.29.0 # libgda-5_0-postgres is required to be able to start glom (bnc#772551) @@ -65,7 +66,7 @@ # This is unfortunately needed for now, should get fixed upstream at some point Requires: postgresql-server # python-glom is a hard requirement to launch glom (bnc#772551) -Requires: python-glom +Requires: python3-glom # Glom verifies fot gi.repository.Gda Python Module (bnc#772551) Requires: typelib(Gda) Recommends: %{name}-lang @@ -126,14 +127,15 @@ * Each Glom system can be translated for multiple languages and countries. -%package -n python-%{name} +%package -n python3-%{name} Summary: Database designer and user interface - Python bindings Group: Development/Languages/Python -# Automatically trigger installation if we have python and glom installed. -Supplements: packageand(glom:python) +# Automatically trigger installation if we have python3 and glom installed. +Supplements: packageand(glom:python3) +Obsoletes: python-glom %py_requires -%description -n python-%{name} +%description -n python3-%{name} With Glom you can design database systems - the database and the user interface. @@ -154,6 +156,8 @@ %build %configure \ + PYTHON_VERSION="3.5" \ + PYTHON=python3.5 \ --disable-static \ --disable-dependency-tracking \ --disable-update-mime-database \ @@ -214,9 +218,9 @@ %defattr(-,root,root) %{_libdir}/*.so.* -%files -n python-%{name} +%files -n python3-%{name} %defattr(-,root,root) -%{py_sitedir}/*.so +%{python3_sitearch}/*.so %files lang -f %{name}.lang ++++++ glom-1.29.4.tar.xz -> glom-1.31.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/glom/glom-1.29.4.tar.xz /work/SRC/openSUSE:Factory/.glom.new/glom-1.31.3.tar.xz differ: char 26, line 1

1 0

commit cntlm for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package cntlm for openSUSE:Factory checked in at 2016-04-01 13:03:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cntlm (Old) and /work/SRC/openSUSE:Factory/.cntlm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cntlm" Changes: -------- --- /work/SRC/openSUSE:Factory/cntlm/cntlm.changes 2016-03-07 13:26:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cntlm.new/cntlm.changes 2016-04-01 13:03:16.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 24 08:58:57 UTC 2016 - mpluskal(a)suse.com + +- Correct typo in changelog +- Fixed boo#914157 + +------------------------------------------------------------------- @@ -4 +10 @@ -- Revert to state withou conflicts +- Revert to state without conflicts ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit crmsh for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2016-04-01 13:03:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-03-26 15:24:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-04-01 13:03:11.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Mar 31 06:00:48 UTC 2016 - kgronlund(a)suse.com + +- Update to version 2.2.0+git.1459359704.8d9b910: + + medium: scripts: Use os.uname() to find hostname (#128) + + low: logparser: Don't crash on nodes without logs + + low: history: Don't skip nodes without logs + + low: parser: ignore case for attr: prefix + + low: scripts: Need sudo if non-local call + + low: history: update the syslog format matching + + low: report: add information about booth + + low: report: if present, use the subsecond part from syslog timestamps + +------------------------------------------------------------------- Old: ---- crmsh-2.2.0+git.1458546035.5df0420.tar.bz2 New: ---- crmsh-2.2.0+git.1459359704.8d9b910.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.jwUre2/_old 2016-04-01 13:03:12.000000000 +0200 +++ /var/tmp/diff_new_pack.jwUre2/_new 2016-04-01 13:03:12.000000000 +0200 @@ -32,11 +32,13 @@ %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define version_unconverted 2.2.0+git.1459359704.8d9b910 + Name: crmsh Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0+git.1458546035.5df0420 +Version: 2.2.0+git.1459359704.8d9b910 Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.jwUre2/_old 2016-04-01 13:03:12.000000000 +0200 +++ /var/tmp/diff_new_pack.jwUre2/_new 2016-04-01 13:03:12.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">5df0420c4bde1f550f5476c9540d5fc0a92105f1</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">8d9b910e4a11cf8f8148b5f97e35602bc71bde03</param></service></servicedata> \ No newline at end of file ++++++ crmsh-2.2.0+git.1458546035.5df0420.tar.bz2 -> crmsh-2.2.0+git.1459359704.8d9b910.tar.bz2 ++++++ ++++ 3406 lines of diff (skipped)

1 0

commit hawk2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package hawk2 for openSUSE:Factory checked in at 2016-04-01 13:02:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk2 (Old) and /work/SRC/openSUSE:Factory/.hawk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hawk2" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2016-03-26 15:24:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hawk2.new/hawk2.changes 2016-04-01 13:03:06.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Mar 31 05:22:46 UTC 2016 - kgronlund(a)suse.com + +- Update to version 2.0.0+git.1459374052.159281a: + + Cib: Save fence history in node data (bsc#968055) + + Wizard: Need admin rights if non-local call + + UI: Status: Display constraints for resource + + UI: Status: Display migration status for resources + + UI: Status: Make remote node indicator a small icon + + Remove use of Hashie + +------------------------------------------------------------------- Old: ---- hawk2-2.0.0+git.1458543074.dc9aa66.tar.bz2 New: ---- hawk2-2.0.0+git.1459374052.159281a.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk2.spec ++++++ --- /var/tmp/diff_new_pack.8P4Rdl/_old 2016-04-01 13:03:07.000000000 +0200 +++ /var/tmp/diff_new_pack.8P4Rdl/_new 2016-04-01 13:03:07.000000000 +0200 @@ -31,11 +31,13 @@ %define gname haclient %define uname hacluster +%define version_unconverted 2.0.0+git.1459374052.159281a + Name: hawk2 Summary: HA Web Konsole License: GPL-2.0 Group: %{pkg_group} -Version: 2.0.0+git.1458543074.dc9aa66 +Version: 2.0.0+git.1459374052.159281a Release: 0 Url: http://www.clusterlabs.org/wiki/Hawk Source: %{name}-%{version}.tar.bz2 @@ -76,7 +78,6 @@ BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2 BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js) >= 1.0 BuildRequires: rubygem(%{rb_default_ruby_abi}:haml-rails) >= 0.8.2 -BuildRequires: rubygem(%{rb_default_ruby_abi}:hashie) >= 3.4 BuildRequires: rubygem(%{rb_default_ruby_abi}:js-routes:1) BuildRequires: rubygem(%{rb_default_ruby_abi}:kramdown:1) >= 1.3 BuildRequires: rubygem(%{rb_default_ruby_abi}:mail) >= 2.6 @@ -110,7 +111,6 @@ Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2 Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js) >= 1.0 Requires: rubygem(%{rb_default_ruby_abi}:haml-rails) >= 0.8.2 -Requires: rubygem(%{rb_default_ruby_abi}:hashie) >= 3.4 Requires: rubygem(%{rb_default_ruby_abi}:js-routes:1) Requires: rubygem(%{rb_default_ruby_abi}:kramdown:1) >= 1.3 Requires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.8P4Rdl/_old 2016-04-01 13:03:07.000000000 +0200 +++ /var/tmp/diff_new_pack.8P4Rdl/_new 2016-04-01 13:03:07.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/hawk.git</param> - <param name="changesrevision">dc9aa660b415aeff726ac9f3dcac441c8fdc7281</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">159281ac28491b758b46e3f492d3990423aa8953</param></service></servicedata> \ No newline at end of file ++++++ hawk2-2.0.0+git.1458543074.dc9aa66.tar.bz2 -> hawk2-2.0.0+git.1459374052.159281a.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/Makefile new/hawk2-2.0.0+git.1459374052.159281a/Makefile --- old/hawk2-2.0.0+git.1458543074.dc9aa66/Makefile 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/Makefile 2016-03-31 07:22:40.000000000 +0200 @@ -50,7 +50,7 @@ (cd hawk; \ if $(BUNDLE_GEMS) ; then \ # Ignore gems from test \ - export BUNDLE_WITHOUT=test && \ + export BUNDLE_WITHOUT="test" && \ # Generate Gemfile.lock \ bundle list && \ # Strip unwanted gems from Gemfile.lock \ @@ -59,7 +59,7 @@ bundle package && bundle install --local --deployment ; \ fi ; \ TEXTDOMAIN=hawk bin/rake gettext:pack; \ - RAILS_ENV=production bin/rake assets:precompile) + RAILS_ENV=production bundle exec rake assets:precompile) %:: %.in sed \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/TODO.md new/hawk2-2.0.0+git.1459374052.159281a/TODO.md --- old/hawk2-2.0.0+git.1458543074.dc9aa66/TODO.md 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/TODO.md 2016-03-31 07:22:40.000000000 +0200 @@ -2,12 +2,6 @@ * Controls for all resources: stop all, start all, ... ? -* Show fencing history for each node: - - stonith_admin -H <node> - -* Indicate when there is fencing history for a node - * Display allocation scores and blocked status * Show if a resource has failcounts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/Gemfile new/hawk2-2.0.0+git.1459374052.159281a/hawk/Gemfile --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/Gemfile 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/Gemfile 2016-03-31 07:22:40.000000000 +0200 @@ -17,7 +17,6 @@ gem "rails", "~> 4.2.0" gem "puma", ">= 2.11" gem "sass-rails", "~> 5.0.1" -gem "hashie", "~> 3.4.0" gem "virtus", "~> 1.0.4" gem "js-routes", "~> 1.0" gem "tilt", "~> 1.4.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/assets/javascripts/module/nodes.js new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/assets/javascripts/module/nodes.js --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/assets/javascripts/module/nodes.js 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/assets/javascripts/module/nodes.js 2016-03-31 07:22:40.000000000 +0200 @@ -66,7 +66,11 @@ var ret = ['']; if (row.remote) { - ret.push(' '); + ret.push(' '); + } + + if (row.fence_history) { + ret.push(' '); } return ret.join(''); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/assets/javascripts/module/resources.js new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/assets/javascripts/module/resources.js --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/assets/javascripts/module/resources.js 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/assets/javascripts/module/resources.js 2016-03-31 07:22:40.000000000 +0200 @@ -186,6 +186,23 @@ return { edit: editRoute, destroy: destroyRoute }; } + function startswith(str, prefix) { + return str.substr(0, prefix.length) === prefix; + } + + function resourceMigrationConstraints(rsc) { + var cib = $('body').data('content'); + var ban = "cli-ban-" + rsc + "-on-"; + var prefer = "cli-prefer-" + rsc; + var ret = []; + $.each(cib.constraints, function(i, c) { + if (c.id == prefer || startswith(c.id, ban)) { + ret.push(c.id); + } + }); + return ret; + } + var statesResourcesColumns = [ { field: 'state', @@ -196,44 +213,31 @@ halign: "center", class: 'col-sm-1', formatter: function(value, row, index) { + var fmt = []; switch(value) { - case "unmanaged": - return [ - '' - ].join(''); - case "started": - return [ - '' - ].join(''); - case "master": - return [ - '' - ].join(''); - case "slave": - return [ - '' - ].join(''); - case "stopped": - return [ - '' - ].join(''); - default: - return [ - '' - ].join(''); - } + case "unmanaged": + fmt.push(''); + break; + case "started": + fmt.push(''); + break; + case "master": + fmt.push(''); + break; + case "slave": + fmt.push(''); + break; + case "stopped": + fmt.push(''); + break; + default: + fmt.push(''); + break; + } + $.each(resourceMigrationConstraints(row.id), function(i, c) { + fmt.push(''); + }); + return fmt.join(""); } }, { @@ -399,8 +403,11 @@ var rsc_routes = resourceRoutes(row); - add_operation("menu", Routes.migrate_cib_resource_path($('body').data('cib'), row.id), 'migrate', 'hand-o-up', __('Migrate')); - add_operation("menu", Routes.unmigrate_cib_resource_path($('body').data('cib'), row.id), 'unmigrate', 'hand-o-down', __('Unmigrate')); + if (resourceMigrationConstraints(row.id).length > 0) { + add_operation("menu", Routes.unmigrate_cib_resource_path($('body').data('cib'), row.id), 'unmigrate', 'chain-broken', __('Unmigrate')); + } else { + add_operation("menu", Routes.migrate_cib_resource_path($('body').data('cib'), row.id), 'migrate', 'arrows', __('Migrate')); + } add_operation("menu", Routes.cleanup_cib_resource_path($('body').data('cib'), row.id), 'cleanup', 'eraser', __('Cleanup')); if (row.object_type == "tag") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/assets/stylesheets/shared/_misc.scss new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/assets/stylesheets/shared/_misc.scss --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/assets/stylesheets/shared/_misc.scss 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/assets/stylesheets/shared/_misc.scss 2016-03-31 07:22:40.000000000 +0200 @@ -59,3 +59,8 @@ .diff_next { background-color: #c0c0c0; } + +.fa-status-small { + font-size: 66%; + vertical-align: top; +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/application_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/application_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/application_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/application_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -218,19 +218,24 @@ end def footer_metadata_items + meta_items = [ + [_("Status"), "meta.status", :status, nil], + [_("Epoch"), "meta.epoch", :epoch, _("Current Configuration Version")], + [_("Host"), "meta.host", :host, nil], + [_("DC"), "meta.dc", :dc, _("Designated Coordinator")], + [_("Schema"), "meta.validate_with", :validate_with, _("CIB Schema Version")], + [_("Last Written"), "meta.cib_last_written", :cib_last_written], + [_("Update Origin"), "meta.update_origin", :update_origin], + [_("Update User"), "meta.update_user", :update_user], + [_("Have Quorum"), "meta.have_quorum", :have_quorum], + [_("Version"), "meta.version", :version, _("Pacemaker Version")], + [_("Stack"), "meta.stack", :stack, _("Cluster Communication Stack")] + ] meta = current_cib.meta - [].tap do |ret| - ret.push [_("Status"), "meta.status", meta.status, nil] - ret.push [_("Epoch"), "meta.epoch", meta.epoch, _("Current Configuration Version")] - ret.push [_("Host"), "meta.host", meta.host, nil] - ret.push [_("DC"), "meta.dc", meta.dc, _("Designated Coordinator")] - ret.push [_("Schema"), "meta.validate_with", meta.validate_with, _("CIB Schema Version")] if meta.validate_with? - ret.push [_("Last Written"), "meta.cib_last_written", meta.cib_last_written] if meta.cib_last_written? - ret.push [_("Update Origin"), "meta.update_origin", meta.update_origin] if meta.update_origin? - ret.push [_("Update User"), "meta.update_user", meta.update_user] if meta.update_user? - ret.push [_("Have Quorum"), "meta.have_quorum", meta.have_quorum] if meta.have_quorum? - ret.push [_("Version"), "meta.version", meta.version, _("Pacemaker Version")] - ret.push [_("Stack"), "meta.stack", meta.stack, _("Cluster Communication Stack")] + ret = [] + meta_items.each do |item| + ret.push [item[0], item[1], meta[item[2]], item[3]] if meta.key? item[2] end + ret end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/clone_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/clone_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/clone_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/clone_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -5,7 +5,7 @@ def clone_child_list @cib.resources.select do |r| !r.key?(:children) || (r.key?(:children) && r[:type] == "group") - end.map(&:id).sort do |a, b| + end.map{|x| x[:id]}.sort do |a, b| a.natcmp(b, true) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/colocation_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/colocation_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/colocation_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/colocation_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -13,8 +13,8 @@ def available_colocation_resources [ - @cib.resources.map(&:id), - @cib.templates.map(&:id) + @cib.resources.map{|x| x[:id]}, + @cib.templates.map{|x| x[:id]} ].flatten.sort do |a, b| a.natcmp(b, true) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/group_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/group_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/group_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/group_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -3,7 +3,7 @@ module GroupHelper def group_children_list - @cib.resources.select { |r| !r.key?(:children) }.map(&:id).sort { |a, b| a.natcmp(b, true) } + @cib.resources.select { |r| !r.key?(:children) }.map { |x| x[:id] }.sort { |a, b| a.natcmp(b, true) } end def group_children_for(group) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/location_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/location_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/location_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/location_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -4,7 +4,7 @@ module LocationHelper def location_resource_options(selected) available = [ - @cib.resources.map(&:id) + @cib.resources.map{|x| x[:id]} ].flatten.uniq.sort do |a, b| a.natcmp(b, true) end @@ -17,7 +17,7 @@ def location_node_options(selected) available = [ - @cib.nodes.map(&:id) + @cib.nodes.map{|x| x[:id]} ].flatten.uniq.sort do |a, b| a.natcmp(b, true) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/master_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/master_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/master_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/master_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -3,9 +3,9 @@ module MasterHelper def master_child_list - options = @cib.resources.select do |r| + @cib.resources.select do |r| !r.key?(:children) || (r.key?(:children) && r[:type] == "group") - end.map(&:id).sort do |a, b| + end.map{|x| x[:id]}.sort do |a, b| a.natcmp(b, true) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/order_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/order_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/order_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/order_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -13,8 +13,8 @@ def available_order_resources [ - @cib.resources.map(&:id), - @cib.templates.map(&:id) + @cib.resources.map{|x| x[:id]}, + @cib.templates.map{|x| x[:id]} ].flatten.sort do |a, b| a.natcmp(b, true) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/role_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/role_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/role_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/role_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -4,7 +4,7 @@ module RoleHelper def role_options(selected) options_for_select( - Role.ordered.map(&:id), + Role.ordered.map{|x| x[:id]}, selected ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/ticket_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/ticket_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/ticket_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/ticket_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -25,8 +25,8 @@ def available_ticket_resources [ - @cib.resources.map(&:id), - @cib.templates.map(&:id) + @cib.resources.map{|x| x[:id]}, + @cib.templates.map{|x| x[:id]} ].flatten.sort do |a, b| a.natcmp(b, true) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/user_helper.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/user_helper.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/helpers/user_helper.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/helpers/user_helper.rb 2016-03-31 07:22:40.000000000 +0200 @@ -4,7 +4,7 @@ module UserHelper def user_options(selected) options_for_select( - User.ordered.map(&:id), + User.ordered.map{|x| x[:id]}, selected ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/models/cib.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/models/cib.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/models/cib.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/models/cib.rb 2016-03-31 07:22:40.000000000 +0200 @@ -72,21 +72,21 @@ def meta @meta ||= begin - struct = Hashie::Mash.new + struct = {} @xml.root.attributes.each do |n, v| struct[n.underscore.to_sym] = Util.unstring(v, '') end unless @xml.nil? - struct.epoch = epoch - struct.dc = dc + struct[:epoch] = epoch + struct[:dc] = dc - struct.host = Socket.gethostname + struct[:host] = Socket.gethostname - struct.version = crm_config[:dc_version] - struct.stack = crm_config[:cluster_infrastructure] + struct[:version] = crm_config[:dc_version] + struct[:stack] = crm_config[:cluster_infrastructure] - struct.status = case + struct[:status] = case when errors.empty? # TODO(must): Add stopped checks @@ -119,18 +119,16 @@ end def offline? - meta.status == :offline + meta[:status] == :offline end def node_state_of_resource(rsc) nodestate = {} rsc[:instances].each do |_, attrs| [:master, :slave, :started, :failed, :pending].each do |rstate| - if attrs[rstate] - attrs[rstate].each do |n| - nodestate[n[:node]] = rstate - end - end + attrs[rstate].each do |n| + nodestate[n[:node]] = rstate + end if attrs[rstate] end end if rsc.key? :instances rsc[:children].each do |child| @@ -141,7 +139,7 @@ def status(minimal = false) { - meta: meta.to_h, + meta: meta, errors: errors, booth: booth }.tap do |result| @@ -260,13 +258,13 @@ protected def get_resource(elem, is_managed = true, clone_max = nil, is_ms = false) - res = Hashie::Mash.new( + res = { id: elem.attributes['id'], object_type: elem.name, attributes: {}, is_managed: is_managed, state: :unknown - ) + } @resources_by_id[elem.attributes['id']] = res elem.elements.each("meta_attributes/nvpair/") do |nv| res[:attributes][nv.attributes["name"]] = nv.attributes["value"] @@ -331,10 +329,10 @@ res[:instances].delete(:default) instance = 0 while res[:instances].length < res[:clone_max] - while res[:instances].key?(instance.to_s) + while res[:instances].key?(instance.to_s.to_sym) instance += 1 end - res[:instances][instance.to_s] = { + res[:instances][instance.to_s.to_sym] = { failed_ops: [], is_managed: res[:is_managed] && !@crm_config[:maintenance_mode] } @@ -343,7 +341,7 @@ # strip any instances outside 0..clone_max if they're not running (these # can be present if, e.g.: you have a clone running on all nodes, then # set clone-max < num_nodes, in which case there'll be stopped orphans). - res[:instances].keys.select{|i| i.to_i >= res[:clone_max]}.each do |k| + res[:instances].keys.select{|i| i.to_s.to_i >= res[:clone_max]}.each do |k| # safe to delete if the instance is present and its only state is stopped res[:instances].delete(k) if res[:instances][k].keys.length == 1 && res[:instances][k].key?(:stopped) end @@ -352,7 +350,7 @@ if res.key?(:instances) res[:instances].delete_if do |k, v| - k.to_s != "default" + k != :default end # Inject a default instance if there's not one, as can be the case when # working with shadow CIBs. @@ -386,7 +384,7 @@ resource[:state] = :stopped if resource[:state] == :unknown resource[:instances].each do |_, states| prio.keys.each do |rstate| - if states.key? rstate.to_s + if states.key? rstate p1 = prio[rstate] p2 = prio[resource[:state]] resource[:state] = rstate if p1 > p2 @@ -545,13 +543,13 @@ @id = id # Special-case defaults for properties we always want to see - @crm_config = Hashie::Mash.new( + @crm_config = { cluster_infrastructure: _('Unknown'), dc_version: _('Unknown'), stonith_enabled: true, symmetric_cluster: true, no_quorum_policy: 'stop', - ) + } # Pull in everything else # TODO(should): This gloms together all cluster property sets; really @@ -560,12 +558,12 @@ @crm_config[p.attributes['name'].underscore.to_sym] = CibTools.get_xml_attr(p, 'value') end - @rsc_defaults = Hashie::Mash.new + @rsc_defaults = {} @xml.elements.each('cib/configuration/rsc_defaults//nvpair') do |p| @rsc_defaults[p.attributes['name'].underscore.to_sym] = CibTools.get_xml_attr(p, 'value') end - @op_defaults = Hashie::Mash.new + @op_defaults = {} @xml.elements.each('cib/configuration/op_defaults//nvpair') do |p| @op_defaults[p.attributes['name'].underscore.to_sym] = CibTools.get_xml_attr(p, 'value') end @@ -603,15 +601,24 @@ if standby and state == :online state = :standby end - @nodes << Hashie::Mash.new( + + # check stonith history + if crm_config[:stonith_enabled] + fence_history = %x[/usr/sbin/stonith_admin -H #{uname} 2>/dev/null].strip + else + fence_history = "" + end + + @nodes << { name: uname || id, uname: uname, state: state, id: node_id, standby: standby, maintenance: maintenance, - remote: remote - ) + remote: remote, + fence_history: fence_history + } if state == :unclean error _('Node "%{node}" is UNCLEAN and needs to be fenced.') % { node: uname } end @@ -626,14 +633,14 @@ state = :unknown standby = false unless @nodes.any? { |nod| nod[:id] == node_id } - @nodes << Hashie::Mash.new( + @nodes << { uname: uname, state: state, id: node_id, standby: standby, maintenance: maintenance, remote: true - ) + } end end @@ -649,12 +656,12 @@ # have state we care about. @templates = [] @xml.elements.each('cib/configuration/resources/template') do |t| - @templates << Hashie::Mash.new( + @templates << { id: t.attributes['id'], class: t.attributes['class'], provider: t.attributes['provider'], type: t.attributes['type'] - ) + } end if Util.has_feature?(:rsc_template) # TODO(must): fix me @@ -665,14 +672,14 @@ @tags = [] @xml.elements.each('cib/configuration/tags/tag') do |t| - @tags << Hashie::Mash.new( + @tags << { id: t.attributes['id'], state: :unknown, object_type: :tag, is_managed: false, running_on: {}, refs: t.elements.collect('obj_ref') { |ref| ref.attributes['id'] } - ) + } end # Iterate nodes in cib order here which makes the faked up clone & ms instance @@ -955,7 +962,7 @@ end end - @booth = Hashie::Mash.new(sites: [], arbitrators: [], tickets: [], me: nil) + @booth = {sites: [], arbitrators: [], tickets: [], me: nil} # Figure out if we're in a geo cluster File.readlines("/etc/booth/booth.conf").each do |line| m = line.match(/^\s*(site|arbitrator|ticket)\s*=(.+)/) @@ -1026,19 +1033,19 @@ def init_offline_cluster(id, user, use_file) @id = id - @meta = Hashie::Mash.new( + @meta = { epoch: "", dc: "", host: "", version: "", stack: "", status: :offline - ) + } - @crm_config = Hashie::Mash.new( + @crm_config = { cluster_infrastructure: _('Unknown'), dc_version: _('Unknown') - ) + } @nodes = [] @resources = [] @resources_by_id = {} @@ -1091,6 +1098,8 @@ instance = :default end + instance = instance.to_sym + # Carry is_managed into the instance itself (needed so we can correctly # display unmanaged clone instances if a single node is on maintenance, # but only do this on first initialization else state may get screwed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/models/node.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/models/node.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/models/node.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/models/node.rb 2016-03-31 07:22:40.000000000 +0200 @@ -19,6 +19,7 @@ attribute :remote, Boolean attribute :maintenance, Boolean attribute :fence, Boolean + attribute :fence_history, String validates :id, presence: { message: _('Node ID is required') }, @@ -145,6 +146,7 @@ record.standby = state[:standby] record.maintenance = state[:maintenance] record.remote = state[:remote] + record.fence_history = state[:fence_history] record.fence = can_fence record.params = if xml.elements['instance_attributes'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/models/resource.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/models/resource.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/models/resource.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/models/resource.rb 2016-03-31 07:22:40.000000000 +0200 @@ -138,6 +138,25 @@ @id = "#{other}-#{i}" end + def rsc_constraints + outp = %x[/usr/sbin/crm_resource --resource "#{id}" -A 2>/dev/null] + info = {} + outp.each_line do |l| + l.strip! + next if l.blank? || l.start_with?('* ') + m = l.match(/\s*: Node (\S+)\s+$score=([^,]+), id=([^)]+)$/) + if m && !info.key?(m[3]) + info[m[3]] = { id: m[3], type: :location, score: m[2], other: m[1] } + else + m = l.match(/\s*(\S+)\s+$score=([^,]+), id=([^)]+)$/) + if m && !info.key?(m[3]) + info[m[3]] = { id: m[3], type: :colocation, score: m[2], other: m[1] } + end + end + end + info.values + end + protected def cib_by_id(id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/models/wizard.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/models/wizard.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/models/wizard.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/models/wizard.rb 2016-03-31 07:22:40.000000000 +0200 @@ -74,7 +74,9 @@ t = (action['text'] || '').split.first || '' return false if ['configure', 'resource', 'cib'].any? { |c| c == t } end - return false if action['name'] == 'call' && action['sudo'].nil? + if action['name'] == 'call' && action['sudo'].nil? && action['nodes'] == 'local' + return false + end true end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/views/cib/show.html.haml new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/views/cib/show.html.haml --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/views/cib/show.html.haml 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/views/cib/show.html.haml 2016-03-31 07:22:40.000000000 +0200 @@ -1,8 +1,8 @@ .container-fluid .row .pull-left - .circle.circle-medium{ class: status_class_for((a)cib.meta.status) } - = status_icon_for((a)cib.meta.status) + .circle.circle-medium{ class: status_class_for(@cib.meta[:status]) } + = status_icon_for(@cib.meta[:status]) %h1 = _("Status") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/views/nodes/show.html.haml new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/views/nodes/show.html.haml --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/views/nodes/show.html.haml 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/views/nodes/show.html.haml 2016-03-31 07:22:40.000000000 +0200 @@ -13,6 +13,9 @@ - if @node.remote .alert.alert-info{role: :alert} = _("Remote node.") + - unless @node.fence_history.blank? + .alert.alert-warning{role: :warning} + = @node.fence_history %table.table.table-condensed %tbody diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/views/resources/show.html.haml new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/views/resources/show.html.haml --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/app/views/resources/show.html.haml 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/app/views/resources/show.html.haml 2016-03-31 07:22:40.000000000 +0200 @@ -134,6 +134,26 @@ %td= content_tag :code, op[:op] %td= content_tag :code, op[:rc_code] %td= content_tag :code, op[:exit_reason] + .panel.panel-default + .panel-heading#r-constraints{role: :tab} + %h4.panel-title + %a{role: :button, data: {toggle: :collapse}, href: "#r-constraints-body", aria: {expanded: true, controls: "r-constraints-body"}} + = _("Constraints") + .pull-right + %span.caret + #r-constraints-body.panel-collapse.collapse.in{role: :tabpanel, aria: {labelledby: "r-constraints"}} + %table.table.table-condensed + %tr + %th= _("ID") + %th= _("Type") + %th= _("Score") + %th= _("To") + - @resource.rsc_constraints.each do |constraint| + %tr + %td= constraint[:id] + %td= constraint[:type] + %td= constraint[:score] + %td= constraint[:other] .modal-footer %button.btn.btn-default{ type: "button", data: { dismiss: "modal" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/config/application.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/config/application.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/config/application.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/config/application.rb 2016-03-31 07:22:40.000000000 +0200 @@ -36,7 +36,9 @@ config.i18n.enforce_available_locales = false if Rails.env.development? - config.web_console.whitelisted_ips = ["192.168.0.0/16", "10.0.2.2", "10.13.37.0/24"] + if config.respond_to? :web_console + config.web_console.whitelisted_ips = ["192.168.0.0/16", "10.0.2.2", "10.13.37.0/24"] + end else config.middleware.use Rack::Deflater end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/config/environments/production.rb new/hawk2-2.0.0+git.1459374052.159281a/hawk/config/environments/production.rb --- old/hawk2-2.0.0+git.1458543074.dc9aa66/hawk/config/environments/production.rb 2016-03-21 09:18:34.000000000 +0100 +++ new/hawk2-2.0.0+git.1459374052.159281a/hawk/config/environments/production.rb 2016-03-31 07:22:40.000000000 +0200 @@ -33,7 +33,7 @@ config.assets.debug = false config.assets.raise_runtime_errors = false config.assets.js_compressor = :uglifier - config.assets.css_compressor = nil + config.assets.css_compressor = :sass config.assets.compile = true config.assets.digest = true config.assets.manifest = Rails.root.join("public", "assets", "manifest.json")

1 0

commit cinnamon for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2016-04-01 13:02:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-16 10:35:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2016-04-01 13:03:02.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Mar 30 21:43:12 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 2.8.8: + * layout.js: Remove code for interaction with the screensaver. + It was always broken until 2.8.7, where it was 'fixed', and has + caused some reported regression where the panels will be hidden + after returning from the screensaver. + +------------------------------------------------------------------- Old: ---- cinnamon-2.8.7.tar.gz New: ---- cinnamon-2.8.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.C00wh4/_old 2016-04-01 13:03:03.000000000 +0200 +++ /var/tmp/diff_new_pack.C00wh4/_new 2016-04-01 13:03:03.000000000 +0200 @@ -21,7 +21,7 @@ %define _name Cinnamon %define _version 2.8.0 Name: cinnamon -Version: 2.8.7 +Version: 2.8.8 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout License: GPL-2.0+ and LGPL-2.1 ++++++ cinnamon-2.8.7.tar.gz -> cinnamon-2.8.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.7/configure.ac new/Cinnamon-2.8.8/configure.ac --- old/Cinnamon-2.8.7/configure.ac 2016-03-07 18:22:23.000000000 +0100 +++ new/Cinnamon-2.8.8/configure.ac 2016-03-29 15:24:20.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ(2.63) -AC_INIT([cinnamon],[2.8.7],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) +AC_INIT([cinnamon],[2.8.8],[https://github.com/linuxmint/Cinnamon/issues],[cinnamon]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/cinnamon-global.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.7/debian/changelog new/Cinnamon-2.8.8/debian/changelog --- old/Cinnamon-2.8.7/debian/changelog 2016-03-07 18:22:23.000000000 +0100 +++ new/Cinnamon-2.8.8/debian/changelog 2016-03-29 15:24:20.000000000 +0200 @@ -1,3 +1,10 @@ +cinnamon (2.8.8) rosa; urgency=medium + + [ Michael Webster ] + * layout.js: Remove code for interaction with the screensaver. It was always broken until 2.8.7, where I 'fixed' it, and has caused some reported regression where the panels will be hidden after returning from the screensaver. + + -- Clement Lefebvre <root(a)linuxmint.com> Tue, 29 Mar 2016 17:23:21 +0400 + cinnamon (2.8.7) rosa; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Cinnamon-2.8.7/js/ui/layout.js new/Cinnamon-2.8.8/js/ui/layout.js --- old/Cinnamon-2.8.7/js/ui/layout.js 2016-03-07 18:22:23.000000000 +0100 +++ new/Cinnamon-2.8.8/js/ui/layout.js 2016-03-29 15:24:20.000000000 +0200 @@ -9,7 +9,6 @@ const St = imports.gi.St; const Main = imports.ui.main; const Params = imports.misc.params; -const ScreenSaver = imports.misc.screenSaver; const Tweener = imports.ui.tweener; const EdgeFlip = imports.ui.edgeFlip; const HotCorner = imports.ui.hotCorner; @@ -378,15 +377,6 @@ global.screen.connect('notify::n-workspaces', Lang.bind(this, this._queueUpdateRegions)); - this._screenSaverActive = false; - this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy(); - this._screenSaverProxy.connectSignal('ActiveChanged', Lang.bind(this, this._onScreenSaverActiveChanged)); - this._screenSaverProxy.GetActiveRemote(Lang.bind(this, - function(result, err) { - if (!err) - this._onScreenSaverActiveChanged(this._screenSaverProxy, null, result); - })); - this._relayout(); }, @@ -518,10 +508,6 @@ let actorData = this._trackedActors[i], visible; if (!actorData.isToplevel) continue; - - if (this._screenSaverActive) { - visible = false; - } else if (this._inOverview) visible = true; else if (!actorData.visibleInFullscreen && @@ -552,12 +538,6 @@ this._updateVisibility(); this._queueUpdateRegions(); }, - - _onScreenSaverActiveChanged: function(proxy, connection, screenSaverActive) { - this._screenSaverActive = screenSaverActive[0]; - this._updateVisibility(); - this._queueUpdateRegions(); - }, _findMonitorForRect: function(x, y, w, h) { // First look at what monitor the center of the rectangle is at

1 0