Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2018-03-08 10:57:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld" Thu Mar 8 10:57:33 2018 rev:64 rq:582697 version:3.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2017-10-18 10:51:59.332631703 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2018-03-08 10:57:35.309142725 +0100 @@ -1,0 +2,5 @@ +Wed Feb 28 16:37:05 UTC 2018 - dims...@opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.Te53SQ/_old 2018-03-08 10:57:36.897085324 +0100 +++ /var/tmp/diff_new_pack.Te53SQ/_new 2018-03-08 10:57:36.897085324 +0100 @@ -1,7 +1,7 @@ # # spec file for package meld # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -20,9 +20,9 @@ Version: 3.18.0 Release: 0 Summary: Visual diff and merge tool -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Other -Url: http://meldmerge.org/ +URL: http://meldmerge.org/ 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 @@ -39,9 +39,6 @@ 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 @@ -51,15 +48,18 @@ # Suggest various vcs that meld can handle Suggests: bzr Suggests: cvs +# Not in Factory, but still in OBS +Suggests: darcs +Suggests: fossil Suggests: git-core Suggests: mercurial Suggests: monotone Suggests: subversion -# Not in Factory, but still in OBS -Suggests: darcs -Suggests: fossil Suggests: tla BuildArch: noarch +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description Meld is a visual diff and merge tool. Two or three files can be @@ -69,6 +69,7 @@ Subversion, Bazaar-ng and Mercurial can be browsed and viewed. %lang_package + %prep %setup -q %patch0 -p1 @@ -103,7 +104,8 @@ %mime_database_postun %files -%doc COPYING NEWS +%license COPYING +%doc NEWS %{_bindir}/%{name} %{_datadir}/%{name}/ %dir %{_datadir}/appdata/
