Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2013-03-08 09:22:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2012-11-19 07:06:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2013-03-08 09:22:53.000000000 +0100 @@ -1,0 +2,35 @@ +Fri Mar 1 16:11:45 UTC 2013 - [email protected] + +- Update to version 1.7.1: + + Features: + - Folder comparisons can now show extra information, such as + file size and modification times. Column visibility and + ordering are properly configurable. + - Shallow comparison (i.e., based on size and timestamp) are + now supported for folder comparisons, including timestamp + resolution preferences for cross-filesystem comparisons. + - The UI for launching new comparisons has been reworked to + have a clearer workflow, and is now shown on startup if no + other comparisons have been opened + - Recently-used comparisons are now supported, allowing you to + re-open previous comparisons directly. + - Read-only files are now not editable by default, making merge + actions clearer and more consistent. Individual read-only + files can easily be set as editable as desired. + + Bugfixes: + - New version control API, currently used by Git and SVN + - Version control compatibility updates and fixes + - Command line labelling options now apply to folder tabs + - Regressions from parallel inline highlighting calculations + have been fixed + - Diff algorithm cleanup + - Compatibility fixes for Python 3; this does *not* mean that + Meld works on Python 3 yet, just that 2to3 issues have been + addressed + + Updated translations. +- Add meld-no-updates.patch: do not execute update-mime-database + and update-desktop-database during make install. We have to + execute these on the target systems. +- Clean up spec-file, removing obsolete if's for old versions. + +------------------------------------------------------------------- Old: ---- meld-1.7.0.tar.xz New: ---- meld-1.7.1.tar.xz meld-no-updates.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.hGSBPY/_old 2013-03-08 09:22:54.000000000 +0100 +++ /var/tmp/diff_new_pack.hGSBPY/_new 2013-03-08 09:22:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package meld # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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,7 +17,7 @@ Name: meld -Version: 1.7.0 +Version: 1.7.1 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ @@ -26,12 +26,16 @@ Source: http://download.gnome.org/sources/meld/1.7/%{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 +# PATCH-FIX-OPENSUSE meld-no-updates.patch [email protected] -- Do not execute mime-cache-update and desktop-database-update in the buildroot. We do not package the cache files +Patch2: meld-no-updates.patch BuildRequires: fdupes -# For directory ownership +# Needed for highcolor macros BuildRequires: hicolor-icon-theme BuildRequires: intltool 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 @@ -40,12 +44,7 @@ %endif # needed for VCS diffs Requires: patch -%if 0%{?suse_version} <= 1130 -# For gconf -Requires: python-gnome -%else Requires: python-gconf -%endif Requires: python-gtk >= 2.8.0 Recommends: %{name}-lang Recommends: python-gtksourceview @@ -75,6 +74,7 @@ %setup -q translation-update-upstream %patch1 +%patch2 -p1 %build make prefix=%{_prefix} libdir=%{_datadir} @@ -90,19 +90,17 @@ %clean rm -rf %{buildroot} -%if 0%{?suse_version} > 1130 - %post %desktop_database_post %icon_theme_cache_post -%endif - -%if 0%{?suse_version} > 1130 +%icon_theme_cache_post HighContrast +%mime_database_post %postun %desktop_database_postun %icon_theme_cache_postun -%endif +%icon_theme_cache_postun HighContrast +%mime_database_postun %files %defattr(-,root,root,-) @@ -117,8 +115,9 @@ %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/icons/HighContrast/ +%{_datadir}/mime/packages/meld.xml %files lang -f %{name}.lang ++++++ meld-1.7.0.tar.xz -> meld-1.7.1.tar.xz ++++++ ++++ 23045 lines of diff (skipped) ++++++ meld-no-updates.patch ++++++ Index: meld-1.7.1/Makefile =================================================================== --- meld-1.7.1.orig/Makefile +++ meld-1.7.1/Makefile @@ -92,8 +92,6 @@ install: $(addsuffix .install,$(SPECIALS $(DESTDIR)$(sharedir)/icons/HighContrast/scalable/apps/meld.svg $(MAKE) -C po install $(MAKE) -C help install - update-mime-database $(DESTDIR)$(sharedir)/mime - update-desktop-database $(DESTDIR)$(sharedir)/applications meld.desktop: data/meld.desktop.in intltool-merge -d po data/meld.desktop.in data/meld.desktop @@ -122,6 +120,4 @@ uninstall: $(sharedir)/pixmaps/meld.png $(MAKE) -C po uninstall $(MAKE) -C help uninstall - update-mime-database $(DESTDIR)$(sharedir)/mime - update-desktop-database $(DESTDIR)$(sharedir)/applications -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
