Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2021-05-03 22:08:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3" Mon May 3 22:08:12 2021 rev:35 rq:889927 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2021-03-05 13:45:12.895618845 +0100 +++ /work/SRC/openSUSE:Factory/.kdiff3.new.2988/kdiff3.changes 2021-05-03 22:08:34.176388862 +0200 @@ -1,0 +2,14 @@ +Mon May 3 06:37:18 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 1.9.0 + * Rewrite of SourceData::FileData::preprocess now only loops + through file contents once. + * Major rework of event handling + * Take advantage of Qt and boost signal/slot pattern to avoid + needless nullptr checks. + * Introduce LineRef wrapper class + * Add enum types and use existing ones. + * Split out doDirectoryCompare from improveFilenames + * Stop mis-using c style [] pointer access + +------------------------------------------------------------------- Old: ---- kdiff3-1.8.5.tar.xz New: ---- kdiff3-1.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.HWVTMf/_old 2021-05-03 22:08:34.652386831 +0200 +++ /var/tmp/diff_new_pack.HWVTMf/_new 2021-05-03 22:08:34.652386831 +0200 @@ -18,18 +18,18 @@ %bcond_without lang Name: kdiff3 -Version: 1.8.5 +Version: 1.9.0 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later Group: Development/Tools/Version Control URL: http://kdiff3.sourceforge.net/ -# Drop the _service file and restore the line below for the next release -# Source0: https://download.kde.org/stable/%%{name}/%%{name}-%%{version}.tar.xz Source0: %{name}-%{version}.tar.xz Source1: kdiff3-lang.tar.xz +BuildRequires: boost-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes +BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem BuildRequires: update-desktop-files BuildRequires: cmake(KF5CoreAddons) @@ -40,7 +40,7 @@ BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(Qt5Core) >= 5.7.0 +BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Widgets) @@ -50,12 +50,9 @@ KDiff3 is a program that: * Compares or merges two or three text input files or directories - * Shows the differences line-by-line and character-by-character - * Provides an automatic merge facility and an integrated editor for solving merge conflicts - * Supports KDE's KIO framework (allows accessing ftp, sftp, fish, smb, etc.) %lang_package @@ -64,26 +61,27 @@ %autosetup -p1 -a1 %build - %cmake_kf5 -d build - %cmake_build +%cmake_kf5 -d build +%cmake_build %install - %kf5_makeinstall -C build - %suse_update_desktop_file -r org.kde.kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File +%kf5_makeinstall -C build +%suse_update_desktop_file -r org.kde.kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File + %if %{with lang} %find_lang %{name} %{name}.lang --with-man %find_lang diff_ext %{name}.lang %find_lang kdiff3fileitemactionplugin %{name}.lang %{kf5_find_htmldocs} %endif - %fdupes %{buildroot} +%fdupes %{buildroot} %files -%license COPYING -%dir %{_kf5_iconsdir}/hicolor/256x256 -%dir %{_kf5_iconsdir}/hicolor/256x256/apps +%license LICENSES/* %doc %lang(en) %{_kf5_htmldir}/en/kdiff3 %doc %lang(en) %{_kf5_mandir}/man1/kdiff3.1%{?ext_man} +%dir %{_kf5_plugindir}/kf5/kfileitemaction +%dir %{_kf5_plugindir}/kf5/parts %{_kf5_applicationsdir}/org.kde.kdiff3.desktop %{_kf5_appstreamdir}/org.kde.kdiff3.appdata.xml %{_kf5_bindir}/kdiff3 @@ -91,9 +89,8 @@ %{_kf5_iconsdir}/hicolor/scalable/apps/kdiff3.svgz %{_kf5_kxmlguidir}/kdiff3/ %{_kf5_kxmlguidir}/kdiff3part/ -%{_kf5_plugindir}/kf5/kfileitemaction/ -%{_kf5_plugindir}/kf5/parts/ -%{_kf5_servicesdir}/kdiff3part.desktop +%{_kf5_plugindir}/kf5/kfileitemaction/kdiff3fileitemaction.so +%{_kf5_plugindir}/kf5/parts/kdiff3part.so %if %{with lang} %files lang -f %{name}.lang ++++++ _service ++++++ --- /var/tmp/diff_new_pack.HWVTMf/_old 2021-05-03 22:08:34.676386729 +0200 +++ /var/tmp/diff_new_pack.HWVTMf/_new 2021-05-03 22:08:34.676386729 +0200 @@ -1,8 +1,8 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">1.8.5</param> + <param name="version">1.9.0</param> <param name="url">https://invent.kde.org/sdk/kdiff3</param> - <param name="revision">refs/tags/1.8.5</param> + <param name="revision">refs/tags/1.9.0</param> <param name="scm">git</param> <param name="filename">kdiff3</param> <!-- This folder will be dropped in the next release --> ++++++ kdiff3-1.8.5.tar.xz -> kdiff3-1.9.0.tar.xz ++++++ ++++ 34092 lines of diff (skipped) ++++++ kdiff3-lang.tar.xz ++++++ ++++ 250580 lines of diff (skipped)
