Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2019-06-18 14:55:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3" Tue Jun 18 14:55:51 2019 rev:30 rq:704043 version:1.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2016-12-01 10:27:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdiff3.new.4811/kdiff3.changes 2019-06-18 14:55:52.677420903 +0200 @@ -1,0 +2,27 @@ +Sun May 19 10:48:23 UTC 2019 - [email protected] + +- Update to 1.8.1: + * Fix enabling of delta movement (kde#407562) + +------------------------------------------------------------------- +Tue May 14 10:22:41 UTC 2019 - [email protected] + +- Update to 1.8: + * Ported to Qt5/KDE Frameworks 5 + * Bugfix: Show Identical files setting not applied after rescan + * Change parameter errors to use dialog on Linux as well as + console output + * Don't sort twice when sorting in reverse order + * Fix memory leak introduced in 0.9.91 + * Implement Cut/Paste + * Don't enable "Choose C for Everything" on two way merge + * Cleanup code +- Update package summary and description +- Run spec-cleaner + +------------------------------------------------------------------- +Thu Dec 8 19:58:01 UTC 2016 - [email protected] + +- Revert kde4_runtime_requires change + +------------------------------------------------------------------- Old: ---- kdiff3-0.9.98.tar.gz New: ---- kdiff3-1.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.02iWth/_old 2019-06-18 14:55:54.281419901 +0200 +++ /var/tmp/diff_new_pack.02iWth/_new 2019-06-18 14:55:54.313419881 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdiff3 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,24 +12,36 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%bcond_without lang Name: kdiff3 -Version: 0.9.98 +Version: 1.8.1 Release: 0 -Summary: Feature-Rich Code Comparison Utility -License: GPL-2.0+ +Summary: Code Comparison Utility +License: GPL-2.0-or-later Group: Development/Tools/Version Control -Url: http://kdiff3.sourceforge.net/ -Source0: %{name}-%{version}.tar.gz +URL: http://kdiff3.sourceforge.net/ +Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz +BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: libkde4-devel -BuildRequires: libkonq-devel +BuildRequires: kf5-filesystem +BuildRequires: update-desktop-files +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(Qt5Core) >= 5.7.0 +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5PrintSupport) +BuildRequires: cmake(Qt5Widgets) Recommends: %{name}-lang = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{?kde4_runtime_requires} %description KDiff3 is a program that: @@ -39,44 +51,49 @@ * Shows the differences line-by-line and character-by-character * Provides an automatic merge facility and an integrated editor for - comfortably solving merge conflicts + solving merge conflicts -* Supports KIO on KDE (allows accessing ftp, sftp, fish, smb, etc.) - -* Has an intuitive graphical user interface +* Supports KDE's KIO framework (allows accessing ftp, sftp, fish, smb, etc.) %lang_package + %prep %setup -q %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - pushd build - make DESTDIR=%{buildroot} install - popd - %suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File - %kde_post_install - %find_lang %{name} %{name}.lang - %find_lang kdiff3plugin %{name}.lang + %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 - rm %{buildroot}%{_kde4_htmldir}/*/kdiff3/common - %fdupes -s %{buildroot} + %kf5_find_htmldocs +%endif + %fdupes %{buildroot} %files -%defattr(-,root,root) -%doc COPYING -%{_kde4_applicationsdir}/kdiff3.desktop -%{_kde4_appsdir}/kdiff3/ -%{_kde4_appsdir}/kdiff3part/ -%{_kde4_bindir}/kdiff3 -%{_kde4_iconsdir}/??color/*/apps/kdiff3.png -%{_kde4_modulesdir}/kdiff3fileitemaction.so -%{_kde4_servicesdir}/kdiff3part.desktop -%{_kde4_servicesdir}/kdiff3fileitemaction.desktop +%license COPYING +%{_kf5_applicationsdir}/org.kde.kdiff3.desktop +%{_kf5_appstreamdir}/org.kde.kdiff3.appdata.xml +%{_kf5_bindir}/kdiff3 +%dir %{_kf5_iconsdir}/hicolor/256x256 +%dir %{_kf5_iconsdir}/hicolor/256x256/apps +%{_kf5_iconsdir}/hicolor/*/apps/kdiff3.png +%{_kf5_iconsdir}/hicolor/scalable/apps/kdiff3.svgz +%{_kf5_kxmlguidir}/kdiff3/ +%{_kf5_kxmlguidir}/kdiff3part/ +%{_kf5_plugindir}/kf5/parts/ +%{_kf5_plugindir}/kf5/kfileitemaction/ +%{_kf5_servicesdir}/kdiff3part.desktop +%doc %lang(en) %{_kf5_mandir}/man1/kdiff3.1%{?ext_man} +%doc %lang(en) %{_kf5_htmldir}/en/kdiff3 +%if %{with lang} %files lang -f %{name}.lang +%endif %changelog
