Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2017-09-11 16:23:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld" Mon Sep 11 16:23:03 2017 rev:62 rq:523053 version:3.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2016-12-22 15:56:56.427042260 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2017-09-11 16:23:41.101168438 +0200 @@ -1,0 +2,132 @@ +Sun Sep 10 23:44:59 UTC 2017 - jeng...@inai.de + +- Rewrite description to put the package in focus. + +------------------------------------------------------------------- +Sat Sep 9 20:46:52 UTC 2017 - zai...@opensuse.org + +- Update to version 3.18.0: + + Fix VC status not updating in some situations non-flattened + mode. + + Command line errors when invoking a secondary instance will no + longer cause the second command to hang until the primary + exits. + + Bugs fixed: bgo#786629. + + Updated translations. + +------------------------------------------------------------------- +Wed Aug 16 18:16:14 UTC 2017 - zai...@opensuse.org + +- Update to version 3.17.4: + + Rebuild source tarball without spurious files. +- Drop obsolete clean section. +- Conditionally apply translations-update-upstream BuildRequires + and macro for non-openSUSE only. + +------------------------------------------------------------------- +Mon Aug 14 14:14:56 UTC 2017 - zai...@opensuse.org + +- Update to version 3.17.3: + + Fix folder compare when using text filters. + + Make activity spinner show when inline comparisons are running. + + Migrate back from threads to multiprocessing for inline diffs; + unusual CPU contention caused this to harm interactivity. + + Manually refreshing a file comparison sometimes caused diff + navigation to break. + + Folder comparisons that update their state no longer break + navigation. + + Version-control comparison on missing files now work again. + + Fix regression in initial focus for folder comparisons. + + Fix handling for added, partially staged files in git. + + Bugs fixed: bgo#784436, bgo#785603, bgo#785859, bgo#786043. + + Updated translations. + +------------------------------------------------------------------- +Sun Jun 11 10:23:35 UTC 2017 - zai...@opensuse.org + +- Update to version 3.17.2: + + UI changes: + - Significantly improve synchronisation of scroll bars between + panes; we now try much harder to scroll all of a chunk on + screen at the top and bottom of comparisons, and handle + last-line-in-file cases better. + - Place the cursor at the start of a replaced chunk instead of + after it; this change should improve keyboard ergonomics when + doing three-way merges, but does change our existing + behaviour. + - Remove Shift-based scroll locking; this was already broken by + a GTK+ change, so this is just making it official. + + Fixes: + - Show correct column offset in status bar for tab indents. + - Fix installation with a prefix for Python 3 changes. + - Fix initial scroll-to-first-difference behaviour to avoid a + race condition if the first change was on the first line. + - Improve text wrapping behaviour in information bars, and + avoid too-large allocations with long labels. + - Work around infinite re-allocation problems and silence GTK+ + allocation warnings. + - Fix bad UI state when closing a single-instance activated + window. + - Fix bad function call when using internal git conflict + resolution. + + Updated translations. + +------------------------------------------------------------------- +Sat Mar 11 13:57:23 UTC 2017 - dims...@opensuse.org + +- Update to version 3.17.1: + + Features: Improve version checking, and try to show users a + nice error dialog when Meld's requirements aren't installed. + + Fixes: + - Help and documentation fixes. + - Re-silence GTK+ logging with glib 2.46 structured logging + changes. + - Fix chunk deletion at EOF with CRLF endings. + - Note filter performance effects in folder preferences. + - Fix button alignment for new chunk action buttons. + - Improve use of the newer emblem in folder comparison by + showing it only when meaningful. + - Fix crash caused by bad colour theme lookup. + + Updated translations. + +------------------------------------------------------------------- +Mon Jan 9 13:25:53 UTC 2017 - dims...@opensuse.org + +- Update to version 3.17.0: + + Port to python3: + - Python 3 support; we now require Python 3.3 as a minimum. + - Python 3 compatibility fixes; too many cases of bytes/string + confusion, syntax changes and other miscellany to mention + individually. + - Handle new unicode-escape behaviour and unicode/bytes + confusion for process interaction and version control + plugins. + - Add support for byte-based filters, to support directory vs. + file comparison filters. + + UI changes: + - The "Tabs" menu item has been removed, to better match up + with more modern GTK+ design. All of the actions are still + available in the expected key bindings, and there is a new + per-tab context menu. + - The change action buttons in the central pane divider now + correctly render as flat buttons. + - The curves in the central pane divider are now... smoother! + + Internal changes: + - Handle reload notifications better in asynchronous saving. + - Remove multi-process diff in favour of asynchronous + (threaded, but GIL-throttled) matching. + - Performance improvements in rendering of multiple widgets, as + well as for initial text comparison. + - Many updates for GTK+ 3.20 and 3.22 ABI changes. + + Fixes: + - Update supported version control list. + - Update requirements and build requirements lists. + - Don't create empty help/figures directories. + + Updated translations. +- Update BuildRequires, Requires and Recommends in line with + upstreams port to python3: + + Removed: python, python-gconf, python-gobject-Gdk, python-gtk + and python-gtksourceview. + + Added: python3, python3-gobject-Gdk. + +------------------------------------------------------------------- Old: ---- meld-3.16.4.tar.xz New: ---- meld-3.18.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.5Iudjm/_old 2017-09-11 16:23:41.565103294 +0200 +++ /var/tmp/diff_new_pack.5Iudjm/_new 2017-09-11 16:23:41.569102732 +0200 @@ -1,7 +1,7 @@ # # spec file for package meld # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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.16.4 +Version: 3.18.0 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.16/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/meld/3.18/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want COPYING and NEWS installed like this Patch0: meld-nodocs.patch BuildRequires: fdupes @@ -36,18 +36,17 @@ BuildRequires: intltool BuildRequires: itstool BuildRequires: libxml2-tools -BuildRequires: python +BuildRequires: python3 >= 3.3 # Needed for shared-mime-info macros BuildRequires: shared-mime-info +%if !0%{?is_opensuse} BuildRequires: translation-update-upstream +%endif BuildRequires: update-desktop-files # needed for VCS diffs Requires: patch -Requires: python-gconf -Requires: python-gobject-Gdk -Requires: python-gtk >= 2.8.0 +Requires: python3-gobject-Gdk Recommends: %{name}-lang -Recommends: python-gtksourceview # Suggest various vcs that meld can handle Suggests: bzr Suggests: cvs @@ -59,27 +58,28 @@ Suggests: darcs Suggests: fossil Suggests: tla -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description -Meld is a visual diff and merge tool. You can compare two or three -files and edit them in place (diffs update dynamically). You can -compare two or three folders and launch file comparisons. You can -browse and view a working copy from popular version control systems -such such as CVS, Subversion, Bazaar-ng and Mercurial. +Meld is a visual diff and merge tool. Two or three files can be +compared and be edited in place. (The diffs update dynamically). Two +or three directories can be compared and file comparisons be launched. +The working copy directory from version control systems such as CVS, +Subversion, Bazaar-ng and Mercurial can be browsed and viewed. %lang_package %prep %setup -q %patch0 -p1 +%if !0%{?is_opensuse} translation-update-upstream +%endif %build -python setup.py build +python3 setup.py build %install -python setup.py \ +python3 setup.py \ --no-update-icon-cache \ --no-compile-schemas \ install --root %{buildroot} --prefix %{_prefix} @@ -87,9 +87,6 @@ %suse_update_desktop_file meld IDE %fdupes %{buildroot}%{_datadir} -%clean -rm -rf %{buildroot} - %post %desktop_database_post %glib2_gsettings_schema_post @@ -105,7 +102,6 @@ %mime_database_postun %files -%defattr(-,root,root,-) %doc COPYING NEWS %{_bindir}/%{name} %{_datadir}/%{name}/ @@ -118,8 +114,8 @@ %{_datadir}/icons/HighContrast/ %{_datadir}/mime/packages/meld.xml %{_mandir}/man1/meld.1%{?ext_man} -%{python_sitelib}/meld/ -%{python_sitelib}/meld*egg-info* +%{python3_sitelib}/meld/ +%{python3_sitelib}/meld*egg-info* %files lang -f %{name}.lang ++++++ meld-3.16.4.tar.xz -> meld-3.18.0.tar.xz ++++++ ++++ 47595 lines of diff (skipped)
