Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2014-09-26 10:52:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-21 10:35:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2014-09-26 11:21:27.000000000 +0200 @@ -1,0 +2,114 @@ +Sat Sep 20 12:18:43 UTC 2014 - [email protected] + +- Update to version 3.11.4: + + Fixes: + - Only apply the auto merge flag to the last comparison + started. + - Fix install layout issues on Debian-based systems. + - Fix "Open External" for files on Windows. + - Record installation directory and executable location on + Windows. + - Revert to using latin1 as a fallback encoding; this will be + reverted in the next unstable series. + + Updated translations. + +------------------------------------------------------------------- +Sat Aug 23 11:05:09 UTC 2014 - [email protected] + +- Update to version 3.11.3: + + Features: + - Manually handle app menu fallback for non-Gnome shells. + - Save and restore window maximisation state. + + Fixes: + - Add missing/incomplete "Language" entries. + - Miscellaneous code cleanups. + - Handle broken locale settings better. + - Fix size allocation issues in preferences UI. + - Update shebang for environments with Python 3 as default. + + Updated translations. + +------------------------------------------------------------------- +Sun Jul 20 13:56:48 UTC 2014 - [email protected] + +- Update to version 3.11.2: + + Features: + - File and folder comparison panes can now be resized. + - Folder comparisons now support scrolling between chunks using + the mouse wheel in the link map, like file comparisons. + + Fixes: + - Don't draw spurious actions for equal chunks. + - Remove default sourceview behaviour for Alt+Left/Right. + - Fix storing translated column names in configuration. + - Several fixes for multiple windows in single-instance + handling: + . Resolve relative paths relative to the correct instance. + . Don't create windows in the original instance when the + calling instance errors out. + . Raise the correct window for new windows in the same + instance. + . Exit correctly for command line errors in the calling + instance. + - Fix display of unicode paths in repositories. + - Fix handling of unicode paths in recent files store. + - Improve behaviour of Open External action, and handle spaces + in filenames for the custom editor option. + - Improve support custom installation prefixes. +- Changes from version 3.11.1: + + Features: + - New (alpha) infrastructure for stand-alone Windows builds. + - Display renames and metadata in Bazaar repositories. + - Improved tab labels in version control comparisons. + - New merge-order preference to accompany comparison-order. + - Added a prompt to mark a conflict as resolved from file + comparison. + + Fixes: + - Fix filtering for shallow folder comparisons. + - Several install and distribution fixes. + - Sundry bug fixes. + + Updated translations. +- Pass --no-update-icon-cache --no-compile-schemas to the distutils + script. + +------------------------------------------------------------------- +Sun Jul 20 10:49:29 UTC 2014 - [email protected] + +- Update to version 3.11.0: + + Features: + - Supporting hiding empty filtered folders in folder + comparison. + - Notify user when files change externally in file comparison. + - Use standard GIO file trash handling when deleting files. + - Newly written Mallard-based help. + + User interface updates: + - Support GNOME 3-style application menu. + - Visual improvements to several icons. + - Update Meld's colour scheme. + - Many visual styling updates, layout tweaks and UI polish. + + Internal changes: + - Port to GObject introspection, GTK+ 3, GApplication, + GSettings and other new things starting with 'G'. + - Port to distutils, based on python-distutils-extra. + - Move to using CSS for styling and colour definitions. + - Update to use more modern GTK widgets. + - Move a lot of extra UI construction into glade/UI files. + - Make several custom icons themeable. + - Make Meld a single-instance application, and add support for + multiple windows. + + Fixes: + - Improved rendering speed in file comparisons. + - Copy and paste within a buffer no longer causes occasional + incorrect change highlighting. + - Fixes for version control support. + - Windows crash fixes. + - Sundry bug fixes. + + Updated translations. +- Drop meld-1.3.0-env.patch: no longer required. +- Add meld-nodocs.patch: do not install COPYING and NEWS: we do + this on our own. +- Drop scrollkeeper BuildRequires: no longer needed. +- Add glib2-devel, gobject-introspection-devel, itstool and + libxml2-tools BuildRequires: new requirements. +- Rewrite build and install section to match new upstream build + system, based on distutils. + +------------------------------------------------------------------- Old: ---- meld-1.3.0-env.patch meld-1.8.6.tar.xz New: ---- meld-3.11.4.tar.xz meld-nodocs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.Ob5TsS/_old 2014-09-26 11:21:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Ob5TsS/_new 2014-09-26 11:21:27.000000000 +0200 @@ -17,29 +17,30 @@ Name: meld -Version: 1.8.6 +Version: 3.11.4 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ Group: Development/Tools/Other Url: http://meld.sourceforge.net/ -Source: http://download.gnome.org/sources/meld/1.8/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE meld-1.3.0-scrollkeeper.patch [email protected] -- don't use env -Patch1: %{name}-1.3.0-env.patch +Source: http://download.gnome.org/sources/meld/3.11/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE meld-nodocs.patch [email protected] -- We do not want COPYING and NEWS installed like this +Patch0: meld-nodocs.patch BuildRequires: fdupes +# Needed for glib2_gsettings_schema macros +BuildRequires: glib2-devel +# Needed for typelib() Requires +BuildRequires: gobject-introspection-devel # Needed for highcolor macros BuildRequires: hicolor-icon-theme BuildRequires: intltool +BuildRequires: itstool +BuildRequires: libxml2-tools BuildRequires: python -BuildRequires: scrollkeeper # Needed for shared-mime-info macros BuildRequires: shared-mime-info BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -%if 0%{?suse_version} <= 1210 -# Only needed for openSUSE <= 12.1; later it is pulled in by rpm-build. -BuildRequires: xz -%endif # needed for VCS diffs Requires: patch Requires: python-gconf @@ -70,16 +71,17 @@ %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream -%patch1 %build -make prefix=%{_prefix} libdir=%{_datadir} +python setup.py build %install -make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_datadir} install -# Remove scrollkeeper files -rm -rf %{buildroot}%{_prefix}%{_localstatedir}/lib/scrollkeeper +python setup.py \ + --no-update-icon-cache \ + --no-compile-schemas \ + install --root %{buildroot} --prefix %{_prefix} %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file meld IDE %fdupes %{buildroot}%{_datadir} @@ -89,12 +91,14 @@ %post %desktop_database_post +%glib2_gsettings_schema_post %icon_theme_cache_post %icon_theme_cache_post HighContrast %mime_database_post %postun %desktop_database_postun +%glib2_gsettings_schema_postun %icon_theme_cache_postun %icon_theme_cache_postun HighContrast %mime_database_postun @@ -102,21 +106,19 @@ %files %defattr(-,root,root,-) %doc COPYING NEWS -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/%{name}/ -%doc %{_datadir}/gnome/help/%{name}/C/ -%dir %{_datadir}/omf/ -%dir %{_datadir}/omf/%{name}/ -%doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/%{name} %{_datadir}/%{name}/ %dir %{_datadir}/appdata/ %{_datadir}/appdata/meld.appdata.xml %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml +%{_datadir}/help/C/meld/ +%{_datadir}/icons/hicolor/*/*/%{name}* %{_datadir}/icons/HighContrast/ %{_datadir}/mime/packages/meld.xml +%{_mandir}/man1/meld.1%{?ext_man} +%{python_sitelib}/meld/ +%{python_sitelib}/meld*egg-info* %files lang -f %{name}.lang ++++++ meld-1.8.6.tar.xz -> meld-3.11.4.tar.xz ++++++ ++++ 82095 lines of diff (skipped) ++++++ meld-nodocs.patch ++++++ Index: meld-3.11.0/setup.py =================================================================== --- meld-3.11.0.orig/setup.py +++ meld-3.11.0/setup.py @@ -39,9 +39,6 @@ setup( ('share/man/man1', ['meld.1'] ), - ('share/doc/meld-' + meld.conf.__version__, - ['COPYING', 'NEWS'] - ), ('share/meld', ['data/meld.css'] ), -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
